diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-12 11:52:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-12 11:52:40 +0000 |
| commit | 056b455404177265926d2c0ffd3fc51174084743 (patch) | |
| tree | c04be4c9c7a66a89da5468cedf117a45721bbd3b | |
| parent | 53437e0bea7bdb74da3ba43f0bd30d2c7d0b9d07 (diff) | |
| download | portage-056b455404177265926d2c0ffd3fc51174084743.tar.gz portage-056b455404177265926d2c0ffd3fc51174084743.tar.bz2 portage-056b455404177265926d2c0ffd3fc51174084743.zip | |
Add missing self.wait() calls when tasks return unsuccessfully.
svn path=/main/trunk/; revision=11027
| -rw-r--r-- | pym/_emerge/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c68181f9b..e22ffd455 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1791,7 +1791,7 @@ class TaskSequence(CompositeTask): def _task_exit_handler(self, task): if self._default_exit(task) != os.EX_OK: - pass + self.wait() elif self._task_queue: self._start_next_task() else: @@ -2269,6 +2269,7 @@ class EbuildBuild(CompositeTask): def _build_exit(self, build): if self._default_exit(build) != os.EX_OK: self._unlock_builddir() + self.wait() return opts = self.opts @@ -2369,6 +2370,7 @@ class EbuildExecuter(CompositeTask): def _clean_phase_exit(self, clean_phase): if self._default_exit(clean_phase) != os.EX_OK: + self.wait() return pkg = self.pkg @@ -2845,6 +2847,7 @@ class Binpkg(CompositeTask): self.wait() return elif self._default_exit(fetcher) != os.EX_OK: + self.wait() return verifier = None @@ -2858,7 +2861,8 @@ class Binpkg(CompositeTask): def _verifier_exit(self, verifier): if verifier is not None and \ self._default_exit(verifier) != os.EX_OK: - return + self.wait() + return logger = self.logger pkg = self.pkg @@ -2889,6 +2893,7 @@ class Binpkg(CompositeTask): def _clean_exit(self, clean_phase): if self._default_exit(clean_phase) != os.EX_OK: self._unlock_builddir() + self.wait() return dir_path = self._build_dir.dir_path @@ -2961,6 +2966,7 @@ class Binpkg(CompositeTask): def _setup_exit(self, setup_phase): if self._default_exit(setup_phase) != os.EX_OK: self._unlock_builddir() + self.wait() return extractor = BinpkgExtractorAsync(background=self.background, |