From 336f280625e59cc31bf9137001fbef46c9b9fb61 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 30 Sep 2012 13:32:06 +0200
Subject: [PATCH] chk_updated_info_files: fix merge fault and fix for Prefix

We still used some old invalid code.  Patch by Alan Hourihane from
gentoo-alt ML.
---
 pym/_emerge/main.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 92fae5c5b..8553bbc22 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -181,9 +181,19 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 									raise
 								del e
 					processed_count += 1
-					myso = portage.subprocess_getstatusoutput(
-						"LANG=C LANGUAGE=C %s/usr/bin/install-info " \
-						"--dir-file=%s/dir %s/%s" % (EPREFIX, inforoot, inforoot, x))[1]
+					try:
+						proc = subprocess.Popen(
+							['%s/usr/bin/install-info'
+							'--dir-file=%s' % (EPREFIX, 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 re.search(existsstr,myso):
-- 
2.26.2