X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Finstall.py;h=7242ce49e0ef617158a3131d1a498ce2ea3c7cd7;hb=9ea122b00e3a99b16246e1e38576916a2e25c0aa;hp=e57ad2a7fe41e1e6789729770d9add2760185f52;hpb=92949e17161a53bfb4a60099e22b58ad63abce4c;p=tld-builder.git

diff --git a/TLD_Builder/install.py b/TLD_Builder/install.py
index e57ad2a..7242ce4 100644
--- 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()
@@ -183,7 +179,7 @@ def install_br(r, b):
     nbr = ""
     for bre in needed.keys():
         nbr = nbr + " " + re.escape(bre)
-    br = string.strip(nbr)
+    br = nbr.strip()
     b.log_line("updating poldek cache...")
     chroot.run("poldek --up --upa", user = "root", logfile = b.logfile)
     # check conflicts in BRed packages
@@ -215,7 +211,7 @@ def install_br(r, b):
     nbr = ""
     for bre in needed.keys():
         nbr = nbr + " " + re.escape(bre)
-    br = string.strip(nbr)
+    br = nbr.strip()
 
     b.log_line("installing BR: %s" % br)
     res = chroot.run("set -x; poldek --noask --caplookup -Q -v %s --upgrade %s" % (b.ignores(), br),