| 1 |
commit: 5551d449dffe531935dcd672f37c5cd3abd55a44 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 18:43:25 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 18:43:25 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5551d449 |
| 7 |
|
| 8 |
chk_updated_info_files: redo previous TypeError fix |
| 9 |
|
| 10 |
Another attempt as suggested and explained by Burcin Erocal. % has |
| 11 |
precedence over +, so concatenate the two strings in the C-way. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/_emerge/main.py | 4 ++-- |
| 15 |
1 files changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 18 |
index 94e33be..84b7b41 100644 |
| 19 |
--- a/pym/_emerge/main.py |
| 20 |
+++ b/pym/_emerge/main.py |
| 21 |
@@ -161,8 +161,8 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): |
| 22 |
del e |
| 23 |
processed_count += 1 |
| 24 |
myso = portage.subprocess_getstatusoutput( |
| 25 |
- "LANG=C LANGUAGE=C %s/usr/bin/install-info " + |
| 26 |
- "--dir-file=%s/dir %s/%s" % (_unicode_decode(EPREFIX), inforoot, inforoot, x))[1] |
| 27 |
+ "LANG=C LANGUAGE=C %s/usr/bin/install-info " \ |
| 28 |
+ "--dir-file=%s/dir %s/%s" % (EPREFIX, inforoot, inforoot, x))[1] |
| 29 |
existsstr="already exists, for file `" |
| 30 |
if myso!="": |
| 31 |
if re.search(existsstr,myso): |
Archives