From 501eef33b5ac990ae4b164a27e635be34cb9d14d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 9 Jun 2011 11:19:38 -0700 Subject: 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/EbuildMetadataPhase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pym/_emerge/EbuildMetadataPhase.py') diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 5925ec462..284622d69 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 @@ -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 -- cgit v1.2.3-1-g7c22