- more python3 fixes, dropped python2 support

[tld-builder.git] / TLD_Builder / install.py

diff --git a/TLD_Builder/install.py b/TLD_Builder/install.py
index 21f80a44ef793d3aa1eed06bd27d251323b23e3a..7242ce49e0ef617158a3131d1a498ce2ea3c7cd7 100644 (file)
--- a/TLD_Builder/install.py
+++ b/TLD_Builder/install.py
@@ -3,11 +3,7 @@
 import re, os
 import string
 import sys
-if sys.version_info[0] == 2:
-    import StringIO
-else:
-    from io import StringIO
-
+from io import StringIO
 import chroot
 import util
 import log
@@ -53,7 +49,7 @@ def close_killset(killset):
     return errors
 
 def upgrade_from_batch(r, b):
-    f = chroot.popen("rpm --test -F %s 2>&1" % string.join(b.files), user = "root")
+    f = chroot.popen("rpm --test -F %s 2>&1" % ' '.join(b.files), user = "root")
     killset = {}
     rx = re.compile(r' \(installed\) (?P<name>[^\s]+)-[^-]+-[^-]+$')
     for l in f:
@@ -66,7 +62,7 @@ def upgrade_from_batch(r, b):
             util.append_to(b.logfile, err)
             log.notice("cannot upgrade rpms")
             return False
-        k = string.join(killset.keys())
+        k = ' '.join(killset.keys())
         if True:
             b.log_line("upgrade requires removal of %s" % k)
             res = chroot.run("rpm -e %s" % k, logfile = b.logfile, user = "root")
@@ -79,8 +75,8 @@ def upgrade_from_batch(r, b):
             b.log_line("upgrade would need removal of %s" % k)
             return False
     b.log_line("upgrading packages")
-    logbuf = StringIO.StringIO()
-    res = chroot.run("rpm -Fvh %s" % string.join(b.files), user = "root", logfile = b.logfile)
+    logbuf = StringIO()
+    res = chroot.run("rpm -Fvh %s" % ' '.join(b.files), user = "root", logfile = b.logfile)
     if res != 0:
         b.log_line("package upgrade failed")
         logbuf.close()