diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-06-09 11:19:38 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-06-09 11:19:38 -0700 |
commit | 501eef33b5ac990ae4b164a27e635be34cb9d14d (patch) | |
tree | b4cb14e8c8e4105b4f166e5ae595c98296d2bc00 /pym/_emerge/SubProcess.py | |
parent | ab6d03f3813318f9ba49e75a52d42972e14cdcc7 (diff) | |
download | portage-501eef33b5ac990ae4b164a27e635be34cb9d14d.tar.gz portage-501eef33b5ac990ae4b164a27e635be34cb9d14d.tar.bz2 portage-501eef33b5ac990ae4b164a27e635be34cb9d14d.zip |
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.
Diffstat (limited to 'pym/_emerge/SubProcess.py')
-rw-r--r-- | pym/_emerge/SubProcess.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index da2b301db..b99cf0bb1 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -87,7 +87,7 @@ class SubProcess(AbstractPollTask): if e.errno != errno.ECHILD: raise del e - self._set_returncode((self.pid, 1)) + self._set_returncode((self.pid, 1 << 8)) else: if wait_retval[0] != 0: self._set_returncode(wait_retval) @@ -98,7 +98,7 @@ class SubProcess(AbstractPollTask): if e.errno != errno.ECHILD: raise del e - self._set_returncode((self.pid, 1)) + self._set_returncode((self.pid, 1 << 8)) else: self._set_returncode(wait_retval) |