1 |
commit: 336f280625e59cc31bf9137001fbef46c9b9fb61 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 30 11:32:06 2012 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 30 11:32:06 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=336f2806 |
7 |
|
8 |
chk_updated_info_files: fix merge fault and fix for Prefix |
9 |
|
10 |
We still used some old invalid code. Patch by Alan Hourihane from |
11 |
gentoo-alt ML. |
12 |
|
13 |
--- |
14 |
pym/_emerge/main.py | 16 +++++++++++++--- |
15 |
1 files changed, 13 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
18 |
index 92fae5c..8553bbc 100644 |
19 |
--- a/pym/_emerge/main.py |
20 |
+++ b/pym/_emerge/main.py |
21 |
@@ -181,9 +181,19 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): |
22 |
raise |
23 |
del e |
24 |
processed_count += 1 |
25 |
- myso = portage.subprocess_getstatusoutput( |
26 |
- "LANG=C LANGUAGE=C %s/usr/bin/install-info " \ |
27 |
- "--dir-file=%s/dir %s/%s" % (EPREFIX, inforoot, inforoot, x))[1] |
28 |
+ try: |
29 |
+ proc = subprocess.Popen( |
30 |
+ ['%s/usr/bin/install-info' |
31 |
+ '--dir-file=%s' % (EPREFIX, os.path.join(inforoot, "dir")), |
32 |
+ os.path.join(inforoot, x)], |
33 |
+ env=dict(os.environ, LANG="C", LANGUAGE="C"), |
34 |
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
35 |
+ except OSError: |
36 |
+ myso = None |
37 |
+ else: |
38 |
+ myso = _unicode_decode( |
39 |
+ proc.communicate()[0]).rstrip("\n") |
40 |
+ proc.wait() |
41 |
existsstr="already exists, for file `" |
42 |
if myso: |
43 |
if re.search(existsstr,myso): |