X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Finstall.py;h=c8eb5438075383f7b53555882222a353c4078680;hb=3ce84d461db5383b79d6940a27ce672932c9ac78;hp=21f80a44ef793d3aa1eed06bd27d251323b23e3a;hpb=98531ab4a0e4e065d3b11b051b3e4bd7653c6ac0;p=tld-builder.git

diff --git a/TLD_Builder/install.py b/TLD_Builder/install.py
index 21f80a4..c8eb543 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
@@ -27,12 +23,12 @@ def close_killset(killset):
         return True
     rx = re.compile(r'^.* marks (?P<name>[^\s]+?)-[^-]+-[^-]+\s.*$')
     errors = ""
-    for p in k:
+    for p in list(k):
         if p in hold:
             del killset[p]
             errors += "cannot remove %s because it's crucial\n" % p
         else:
-            f = chroot.popen("poldek --noask --test --test --erase %s" % p, user = "root")
+            f = chroot.popen("poldek --noask --test --test --erase %s" % p, user = "root", encoding = "utf-8")
             crucial = 0
             e = []
             for l in f:
@@ -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", encoding = "utf-8")
     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()
@@ -104,7 +100,7 @@ def uninstall(conflicting, b):
     return True
 
 def is_rpmorg():
-    f = chroot.popen("rpm --version 2>&1")
+    f = chroot.popen("rpm --version 2>&1", encoding = "utf-8")
     v = re.compile(r'(RPM version|rpm \(RPM\)) (?P<major>\d)\.(?P<minor>\d+)(\.\d+)?')
     for l in f:
         m = v.search(l)
@@ -129,7 +125,7 @@ def uninstall_self_conflict(b):
         'rpmdefs' : b.rpmbuild_opts(),
         'topdir' : b.get_topdir(),
         'spec': b.spec,
-    })
+    }, encoding = "utf-8")
     # java-sun >= 1.5 conflicts with soprano-2.1.67-1.src
     # java-sun conflicts with soprano-2.1.67-1.src
     rx = re.compile(r"\s+(?P<name>[\w-]+)\s+.*conflicts with [^\s]+-[^-]+-[^-]+\.src($| .*)")
@@ -162,7 +158,7 @@ def install_br(r, b):
             'rpmdefs' : b.rpmbuild_opts(),
             'spec': b.spec,
         }
-        f = chroot.popen(cmd)
+        f = chroot.popen(cmd, encoding = "utf-8")
         rx = re.compile(r"^\s*(?P<name>[^\s]+) .*is needed by")
         needed = {}
         b.log_line("checking BR")
@@ -188,7 +184,7 @@ def install_br(r, b):
     chroot.run("poldek --up --upa", user = "root", logfile = b.logfile)
     # check conflicts in BRed packages
     b.log_line("checking conflicting packages in BRed packages")
-    f = chroot.popen("poldek --test --test --noask --caplookup -Q -v %s --upgrade %s" % (b.ignores(), br), user = "root")
+    f = chroot.popen("poldek --test --test --noask --caplookup -Q -v %s --upgrade %s" % (b.ignores(), br), user = "root", encoding = "utf-8")
     # phonon-devel-4.3.1-1.i686 conflicts with qt4-phonon-devel-4.5.0-6.i686
     # jdbc-stdext >= 2.0 is required by installed java-struts-1.3.10-1.noarch
     # jmx is needed by (installed) java-commons-modeler-2.0-1.noarch