| 1 |
On 21-09-2012 09:42:10 +0100, Alan Hourihane wrote: |
| 2 |
> >>> Just digging in now, but thought I'd report if others have already seen. |
| 3 |
> >>> |
| 4 |
> >> Yes, this function no longer exists and there seems to be a large hunk of |
| 5 |
> >> code missing compared to mainline gentoo around this region of code. |
| 6 |
> >> |
| 7 |
> > Anyone else see this ? |
| 8 |
> |
| 9 |
> Patch attached for _emerge/main.py |
| 10 |
|
| 11 |
Thanks! |
| 12 |
|
| 13 |
Hmm, so the problem here is install-info not being available? Does it |
| 14 |
have to use subprocess.Popen instead of the portage wrapper thing? |
| 15 |
|
| 16 |
|
| 17 |
> --- _emerge/main.py 2012-09-20 18:52:38.000000000 +0100 |
| 18 |
> +++ /tmp/main.py 2012-09-20 18:27:38.000000000 +0100 |
| 19 |
> @@ -182,9 +182,19 @@ |
| 20 |
> raise |
| 21 |
> del e |
| 22 |
> processed_count += 1 |
| 23 |
> - myso = portage.subprocess_getstatusoutput( |
| 24 |
> - "LANG=C LANGUAGE=C %s/usr/bin/install-info " \ |
| 25 |
> - "--dir-file=%s/dir %s/%s" % (EPREFIX, inforoot, inforoot, x))[1] |
| 26 |
> + try: |
| 27 |
> + proc = subprocess.Popen( |
| 28 |
> + ['%s/usr/bin/install-info' |
| 29 |
> + '--dir-file=%s' % (EPREFIX, os.path.join(inforoot, "dir")), |
| 30 |
> + os.path.join(inforoot, x)], |
| 31 |
> + env=dict(os.environ, LANG="C", LANGUAGE="C"), |
| 32 |
> + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
| 33 |
> + except OSError: |
| 34 |
> + myso = None |
| 35 |
> + else: |
| 36 |
> + myso = _unicode_decode( |
| 37 |
> + proc.communicate()[0]).rstrip("\n") |
| 38 |
> + proc.wait() |
| 39 |
> existsstr="already exists, for file `" |
| 40 |
> if myso: |
| 41 |
> if re.search(existsstr,myso): |
| 42 |
|
| 43 |
|
| 44 |
-- |
| 45 |
Fabian Groffen |
| 46 |
Gentoo on a different level |
Archives