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/actions.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/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 08f11836e..fda9f3d81 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2,7 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import commands +try: + from subprocess import getstatusoutput as subprocess_getstatusoutput +except ImportError: + from commands import getstatusoutput as subprocess_getstatusoutput import errno import logging import platform @@ -1240,7 +1243,7 @@ def action_info(settings, trees, myopts, myfiles): else: print("Unknown") - output=commands.getstatusoutput("distcc --version") + output=subprocess_getstatusoutput("distcc --version") if not output[0]: print(str(output[1].split("\n",1)[0]), end=' ') if "distcc" in settings.features: @@ -1248,7 +1251,7 @@ def action_info(settings, trees, myopts, myfiles): else: print("[disabled]") - output=commands.getstatusoutput("ccache -V") + output=subprocess_getstatusoutput("ccache -V") if not output[0]: print(str(output[1].split("\n",1)[0]), end=' ') if "ccache" in settings.features: @@ -2661,16 +2664,16 @@ def getgccversion(chost): "!!! other terminals also.\n" ) - mystatus, myoutput = commands.getstatusoutput("gcc-config -c") + mystatus, myoutput = subprocess_getstatusoutput("gcc-config -c") if mystatus == os.EX_OK and myoutput.startswith(chost + "-"): return myoutput.replace(chost + "-", gcc_ver_prefix, 1) - mystatus, myoutput = commands.getstatusoutput( + mystatus, myoutput = subprocess_getstatusoutput( chost + "-" + gcc_ver_command) if mystatus == os.EX_OK: return gcc_ver_prefix + myoutput - mystatus, myoutput = commands.getstatusoutput(gcc_ver_command) + mystatus, myoutput = subprocess_getstatusoutput(gcc_ver_command) if mystatus == os.EX_OK: return gcc_ver_prefix + myoutput |