From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 87A30138010 for ; Sun, 30 Sep 2012 11:33:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94B5DE0484; Sun, 30 Sep 2012 11:33:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 61904E0484 for ; Sun, 30 Sep 2012 11:33:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 683F733C206 for ; Sun, 30 Sep 2012 11:33:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1F7BFE5441 for ; Sun, 30 Sep 2012 11:33:19 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1349004726.336f280625e59cc31bf9137001fbef46c9b9fb61.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 336f280625e59cc31bf9137001fbef46c9b9fb61 X-VCS-Branch: prefix Date: Sun, 30 Sep 2012 11:33:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c49a1ce-75be-4959-add3-30f7be8dad4c X-Archives-Hash: d70f4682fcfb3d573afd4555336a7aca commit: 336f280625e59cc31bf9137001fbef46c9b9fb61 Author: Fabian Groffen gentoo org> AuthorDate: Sun Sep 30 11:32:06 2012 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Sep 30 11:32:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=336f2806 chk_updated_info_files: fix merge fault and fix for Prefix We still used some old invalid code. Patch by Alan Hourihane from gentoo-alt ML. --- pym/_emerge/main.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 92fae5c..8553bbc 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -181,9 +181,19 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): raise del e processed_count += 1 - myso = portage.subprocess_getstatusoutput( - "LANG=C LANGUAGE=C %s/usr/bin/install-info " \ - "--dir-file=%s/dir %s/%s" % (EPREFIX, inforoot, inforoot, x))[1] + try: + proc = subprocess.Popen( + ['%s/usr/bin/install-info' + '--dir-file=%s' % (EPREFIX, os.path.join(inforoot, "dir")), + os.path.join(inforoot, x)], + env=dict(os.environ, LANG="C", LANGUAGE="C"), + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + except OSError: + myso = None + else: + myso = _unicode_decode( + proc.communicate()[0]).rstrip("\n") + proc.wait() existsstr="already exists, for file `" if myso: if re.search(existsstr,myso):