Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:prefix commit in: pym/_emerge/
Date: Mon, 29 Aug 2011 19:03:24
Message-Id: 749ef8e20137bede1a9824448b2676224b06f71b.grobian@gentoo
1 commit: 749ef8e20137bede1a9824448b2676224b06f71b
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 29 19:00:10 2011 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 29 19:00:10 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=749ef8e2
7
8 chk_updated_info_files: run _unicode_decode on EPREFIX
9
10 Attempt to avoid
11 TypeError: not all arguments converted during string formatting
12
13 ---
14 pym/_emerge/main.py | 2 +-
15 1 files changed, 1 insertions(+), 1 deletions(-)
16
17 diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
18 index 7aa9852..ec7e0ce 100644
19 --- a/pym/_emerge/main.py
20 +++ b/pym/_emerge/main.py
21 @@ -161,7 +161,7 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
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 + "--dir-file=%s/dir %s/%s" % (_unicode_decode(EPREFIX), inforoot, inforoot, x))[1]
27 existsstr="already exists, for file `"
28 if myso!="":
29 if re.search(existsstr,myso):