X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Finstall.py;h=7242ce49e0ef617158a3131d1a498ce2ea3c7cd7;hb=9ea122b00e3a99b16246e1e38576916a2e25c0aa;hp=02cdfd739f18d958b12ee081ed5fde5f0207dd94;hpb=c4d0706eae2dd9530000a8ad8b62188c417c2caa;p=tld-builder.git diff --git a/TLD_Builder/install.py b/TLD_Builder/install.py index 02cdfd7..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 @@ -79,7 +75,7 @@ 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() + 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")