From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 658021396D0 for ; Wed, 9 Aug 2017 20:39:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF0221FC019; Wed, 9 Aug 2017 20:39:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D6451FC019 for ; Wed, 9 Aug 2017 20:39:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7256334182A for ; Wed, 9 Aug 2017 20:39:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E15DA3B9E for ; Wed, 9 Aug 2017 20:39:34 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1502311166.540b97e416371c03e681625dd02a8f0eb371e9ab.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/sync/modules/git/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/modules/git/git.py X-VCS-Directories: pym/portage/sync/modules/git/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 540b97e416371c03e681625dd02a8f0eb371e9ab X-VCS-Branch: master Date: Wed, 9 Aug 2017 20:39:34 +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: 62e6016e-5338-4212-9e2e-421290905e71 X-Archives-Hash: c89ac7893b9adda8e914a98d2cf30909 commit: 540b97e416371c03e681625dd02a8f0eb371e9ab Author: Zac Medico gentoo org> AuthorDate: Wed Aug 9 20:38:08 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Aug 9 20:39:26 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=540b97e4 GitSync: fix subprocess.CalledProcessError reference (bug 627416) Fixes: 0e1699ad6b3f ("emerge: Add head commit per repo to --info") pym/portage/sync/modules/git/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py index 8df9ca612..19c167485 100644 --- a/pym/portage/sync/modules/git/git.py +++ b/pym/portage/sync/modules/git/git.py @@ -139,6 +139,6 @@ class GitSync(NewBase): try: ret = (os.EX_OK, subprocess.check_output(rev_cmd, cwd=portage._unicode_encode(self.repo.location))) - except CalledProcessError: + except subprocess.CalledProcessError: ret = (1, False) return ret