Fix issues when running release.py on older Python (#143)

OSC · Oct 30, 2021 · 08466de · 08466de
1 parent 92fa0dd
commit 08466de
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/release.py b/release.py
@@ -89,29 +89,29 @@ def update_apt_repo(host, path, dist, release, pkey, gpgpass):
     md5sum_cmd = "cd %s ; md5sum main/binary-amd64/Packages*" % dist_path
     logger.debug("Executing via SSH oodpkg@%s '%s'", host, md5sum_cmd)
     md5sum_stdin, md5sum_stdout, md5sum_stderr = ssh.exec_command(md5sum_cmd)
-    md5sum_out = md5sum_stdout.read()
-    md5sum_err = md5sum_stderr.read()
+    md5sum_out = md5sum_stdout.read().decode('ascii')
+    md5sum_err = md5sum_stderr.read().decode('ascii')
     logger.debug("SSH CMD STDOUT:\n%s", md5sum_out)
     logger.debug("SSH CMD STDERR:\n%s", md5sum_err)
     sha1sum_cmd = "cd %s ; sha1sum main/binary-amd64/Packages*" % dist_path
     logger.debug("Executing via SSH oodpkg@%s '%s'", host, sha1sum_cmd)
     sha1sum_stdin, sha1sum_stdout, sha1sum_stderr = ssh.exec_command(sha1sum_cmd)
-    sha1sum_out = sha1sum_stdout.read()
-    sha1sum_err = sha1sum_stderr.read()
+    sha1sum_out = sha1sum_stdout.read().decode('ascii')
+    sha1sum_err = sha1sum_stderr.read().decode('ascii')
     logger.debug("SSH CMD STDOUT:\n%s", sha1sum_out)
     logger.debug("SSH CMD STDERR:\n%s", sha1sum_err)
     sha256sum_cmd = "cd %s ; sha256sum main/binary-amd64/Packages*" % dist_path
     logger.debug("Executing via SSH oodpkg@%s '%s'", host, sha256sum_cmd)
     sha256sum_stdin, sha256sum_stdout, sha256sum_stderr = ssh.exec_command(sha256sum_cmd)
-    sha256sum_out = sha256sum_stdout.read()
-    sha256sum_err = sha256sum_stderr.read()
+    sha256sum_out = sha256sum_stdout.read().decode('ascii')
+    sha256sum_err = sha256sum_stderr.read().decode('ascii')
     logger.debug("SSH CMD STDOUT:\n%s", sha256sum_out)
     logger.debug("SSH CMD STDERR:\n%s", sha256sum_err)
     wc_cmd = "cd %s ; wc -c main/binary-amd64/Packages*" % dist_path
     logger.debug("Executing via SSH oodpkg@%s '%s'", host, wc_cmd)
     wc_stdin, wc_stdout, wc_stderr = ssh.exec_command(wc_cmd)
-    wc_out = wc_stdout.read()
-    wc_err = wc_stderr.read()
+    wc_out = wc_stdout.read().decode('ascii')
+    wc_err = wc_stderr.read().decode('ascii')
     logger.debug("SSH CMD STDOUT:\n%s", wc_out)
     logger.debug("SSH CMD STDERR:\n%s", wc_err)
     utcnow = datetime.datetime.utcnow()
@@ -164,7 +164,7 @@ def update_apt_repo(host, path, dist, release, pkey, gpgpass):
 {sha256sums}
 """.format(dist=dist, release=release, date=date, md5sums="\n".join(md5sums), sha1sums="\n".join(sha1sums), sha256sums="\n".join(sha256sums))
     release_path = os.path.join(dist_path, 'Release')
-    release_tmp = tempfile.NamedTemporaryFile(delete=False)
+    release_tmp = tempfile.NamedTemporaryFile(delete=False, mode='w')
     release_tmp.write(release)
     release_tmp.close()
     sftp = ssh.open_sftp()