From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QUjqf-0006ZG-28 for garchives@archives.gentoo.org; Thu, 09 Jun 2011 18:20:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0EC01C137; Thu, 9 Jun 2011 18:19:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7CAEE1C137 for ; Thu, 9 Jun 2011 18:19:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5F6B1B402E for ; Thu, 9 Jun 2011 18:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3E48F8003C for ; Thu, 9 Jun 2011 18:19:54 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <501eef33b5ac990ae4b164a27e635be34cb9d14d.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AbstractEbuildProcess.py pym/_emerge/BinpkgFetcher.py pym/_emerge/EbuildFetcher.py pym/_emerge/EbuildMetadataPhase.py pym/_emerge/SubProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 501eef33b5ac990ae4b164a27e635be34cb9d14d Date: Thu, 9 Jun 2011 18:19:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a7033495f76bd9258155bfb217c576f4 commit: 501eef33b5ac990ae4b164a27e635be34cb9d14d Author: Zac Medico gentoo org> AuthorDate: Thu Jun 9 18:19:38 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jun 9 18:19:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D501eef33 SubProcess: fix status for _set_returncode caller These callers don't intend to make WIFSIGNALED return True, so they need to shift their codes 8 bits to the left. This ensures that commit 88f5bf84e2fd23125910b2ecaffc035971445696 behaves as intended. --- pym/_emerge/AbstractEbuildProcess.py | 2 +- pym/_emerge/BinpkgFetcher.py | 2 +- pym/_emerge/EbuildFetcher.py | 6 +++--- pym/_emerge/EbuildMetadataPhase.py | 4 ++-- pym/_emerge/SubProcess.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractE= buildProcess.py index 4348788..0d1d991 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -57,7 +57,7 @@ class AbstractEbuildProcess(SpawnProcess): "since PORTAGE_BUILDIR does not exist: '%s'") % \ (self.phase, self.settings['PORTAGE_BUILDDIR']) self._eerror(textwrap.wrap(msg, 72)) - self._set_returncode((self.pid, 1)) + self._set_returncode((self.pid, 1 << 8)) self.wait() return =20 diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index 12544d1..6c1dde9 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -65,7 +65,7 @@ class BinpkgFetcher(SpawnProcess): =20 if pretend: portage.writemsg_stdout("\n%s\n" % uri, noiselevel=3D-1) - self._set_returncode((self.pid, os.EX_OK)) + self._set_returncode((self.pid, os.EX_OK << 8)) self.wait() return =20 diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py index 0ea8dc7..c9a107d 100644 --- a/pym/_emerge/EbuildFetcher.py +++ b/pym/_emerge/EbuildFetcher.py @@ -38,13 +38,13 @@ class EbuildFetcher(SpawnProcess): (self.pkg.cpv, e) msg_lines.append(msg) self._eerror(msg_lines) - self._set_returncode((self.pid, 1)) + self._set_returncode((self.pid, 1 << 8)) self.wait() return =20 if not uri_map: # Nothing to fetch. - self._set_returncode((self.pid, os.EX_OK)) + self._set_returncode((self.pid, os.EX_OK << 8)) self.wait() return =20 @@ -59,7 +59,7 @@ class EbuildFetcher(SpawnProcess): if self.prefetch and \ self._prefetch_size_ok(uri_map, settings, ebuild_path): self.config_pool.deallocate(settings) - self._set_returncode((self.pid, os.EX_OK)) + self._set_returncode((self.pid, os.EX_OK << 8)) self.wait() return =20 diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index 5925ec4..284622d 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -46,7 +46,7 @@ class EbuildMetadataPhase(SubProcess): if not portage.eapi_is_supported(eapi): self.metadata_callback(self.cpv, self.ebuild_path, self.repo_path, {'EAPI' : eapi}, self.ebuild_mtime) - self._set_returncode((self.pid, os.EX_OK)) + self._set_returncode((self.pid, os.EX_OK << 8)) self.wait() return =20 @@ -98,7 +98,7 @@ class EbuildMetadataPhase(SubProcess): if isinstance(retval, int): # doebuild failed before spawning self._unregister() - self._set_returncode((self.pid, retval)) + self._set_returncode((self.pid, retval << 8)) self.wait() return =20 diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index da2b301..b99cf0b 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -87,7 +87,7 @@ class SubProcess(AbstractPollTask): if e.errno !=3D errno.ECHILD: raise del e - self._set_returncode((self.pid, 1)) + self._set_returncode((self.pid, 1 << 8)) else: if wait_retval[0] !=3D 0: self._set_returncode(wait_retval) @@ -98,7 +98,7 @@ class SubProcess(AbstractPollTask): if e.errno !=3D errno.ECHILD: raise del e - self._set_returncode((self.pid, 1)) + self._set_returncode((self.pid, 1 << 8)) else: self._set_returncode(wait_retval) =20