Use portage.subprocess_getstatusoutput() more.

[portage.git] / pym / _emerge / main.py

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 21dea40355ec2891ed5026b7ce93975bf76e87ad..42ce81069b7c832160f04d4ee9d8de891b629891 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -9,10 +9,6 @@ import stat
 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
@@ -162,7 +158,9 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
                                                                        raise
                                                                del e
                                        processed_count += 1
-                                       myso=subprocess_getstatusoutput("LANG=C LANGUAGE=C /usr/bin/install-info --dir-file="+inforoot+"/dir "+inforoot+"/"+x)[1]
+                                       myso = portage.subprocess_getstatusoutput(
+                                               "LANG=C LANGUAGE=C /usr/bin/install-info " +
+                                               "--dir-file=%s/dir %s/%s" % (inforoot, inforoot, x))[1]
                                        existsstr="already exists, for file `"
                                        if myso!="":
                                                if re.search(existsstr,myso):