install-info: avoid unnecessary shell

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 45ca6f5fa7328e9903ce641943b00250fba340b4..c1adced3d13feeda2cf475c0e99e812067da1bcf 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -6,6 +6,7 @@ from __future__ import print_function
 import logging
 import signal
 import stat
+import subprocess
 import sys
 import textwrap
 import platform
@@ -179,11 +180,21 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
                                                                        raise
                                                                del e
                                        processed_count += 1
-                                       myso = portage.subprocess_getstatusoutput(
-                                               "LANG=C LANGUAGE=C /usr/bin/install-info " +
-                                               "--dir-file=%s/dir %s/%s" % (inforoot, inforoot, x))[1]
+                                       try:
+                                               proc = subprocess.Popen(
+                                                       ['/usr/bin/install-info',
+                                                       '--dir-file=%s' % os.path.join(inforoot, "dir"),
+                                                       os.path.join(inforoot, x)],
+                                                       env=dict(os.environ, LANG="C", LANGUAGE="C"),
+                                                       stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                                       except OSError:
+                                               myso = None
+                                       else:
+                                               myso = _unicode_decode(
+                                                       proc.communicate()[0]).rstrip("\n")
+                                               proc.wait()
                                        existsstr="already exists, for file `"
-                                       if myso!="":
+                                       if myso:
                                                if re.search(existsstr,myso):
                                                        # Already exists... Don't increment the count for this.
                                                        pass