From 5551d449dffe531935dcd672f37c5cd3abd55a44 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 31 Aug 2011 20:43:25 +0200 Subject: 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. --- pym/_emerge/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 94e33be17..84b7b41ca 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): -- cgit v1.2.3-65-gdbad