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
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:
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")
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()