diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-20 16:22:08 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-20 16:22:08 +0000 |
commit | 8243a08d6d2121e4c1e92201c9d4361df42e5d8f (patch) | |
tree | 8885f3b3d554054901d15c7a77bad789a8aa12e8 /pym/_emerge/main.py | |
parent | 5ce55d59b6a1e0fabd4e7879aa94f69251d03d69 (diff) | |
download | portage-8243a08d6d2121e4c1e92201c9d4361df42e5d8f.tar.gz portage-8243a08d6d2121e4c1e92201c9d4361df42e5d8f.tar.bz2 portage-8243a08d6d2121e4c1e92201c9d4361df42e5d8f.zip |
Update system imports for compatibility with Python 3.
svn path=/main/trunk/; revision=14294
Diffstat (limited to 'pym/_emerge/main.py')
-rw-r--r-- | pym/_emerge/main.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index cf3a4e416..950314662 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -7,12 +7,16 @@ import signal import sys import textwrap import platform +try: + from subprocess import getstatusoutput as subprocess_getstatusoutput +except ImportError: + from commands import getstatusoutput as subprocess_getstatusoutput import portage from portage import os from portage import _encodings from portage import _unicode_decode import _emerge.help -import portage.xpak, commands, errno, re, time +import portage.xpak, errno, re, time from portage.output import colorize, xtermTitle, xtermTitleReset from portage.output import create_color_func good = create_color_func("GOOD") @@ -142,7 +146,7 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): raise del e processed_count += 1 - myso=commands.getstatusoutput("LANG=C LANGUAGE=C /usr/bin/install-info --dir-file="+inforoot+"/dir "+inforoot+"/"+x)[1] + myso=subprocess_getstatusoutput("LANG=C LANGUAGE=C /usr/bin/install-info --dir-file="+inforoot+"/dir "+inforoot+"/"+x)[1] existsstr="already exists, for file `" if myso!="": if re.search(existsstr,myso): |