aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-08-31 18:43:25 (GMT)
committerFabian Groffen <grobian@gentoo.org>2011-08-31 18:43:25 (GMT)
commit5551d449dffe531935dcd672f37c5cd3abd55a44 (patch)
treea50309322ff85af0e91f1a298e8cdb70cab53786
parentMerge remote-tracking branch 'overlays-gentoo-org/master' into prefix (diff)
downloadportage-5551d449dffe531935dcd672f37c5cd3abd55a44.zip
portage-5551d449dffe531935dcd672f37c5cd3abd55a44.tar.gz
portage-5551d449dffe531935dcd672f37c5cd3abd55a44.tar.bz2
chk_updated_info_files: redo previous TypeError fix
Another attempt as suggested and explained by Burcin Erocal. % has precedence over +, so concatenate the two strings in the C-way.
-rw-r--r--pym/_emerge/main.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 94e33be..84b7b41 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -161,8 +161,8 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
del e
processed_count += 1
myso = portage.subprocess_getstatusoutput(
- "LANG=C LANGUAGE=C %s/usr/bin/install-info " +
- "--dir-file=%s/dir %s/%s" % (_unicode_decode(EPREFIX), inforoot, inforoot, x))[1]
+ "LANG=C LANGUAGE=C %s/usr/bin/install-info " \
+ "--dir-file=%s/dir %s/%s" % (EPREFIX, inforoot, inforoot, x))[1]
existsstr="already exists, for file `"
if myso!="":
if re.search(existsstr,myso):