chk_updated_info_files: redo previous TypeError fix
authorFabian Groffen <grobian@gentoo.org>
Wed, 31 Aug 2011 18:43:25 +0000 (20:43 +0200)
committerFabian Groffen <grobian@gentoo.org>
Wed, 31 Aug 2011 18:43:25 +0000 (20:43 +0200)
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

index 94e33be..84b7b41 100644 (file)
@@ -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):