diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-12-12 21:36:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-12 21:36:15 +0000 |
| commit | 660acdf48a0521ec527dd3187470b62a315eae43 (patch) | |
| tree | 00e0b44b5ed29dcf9d530d2f6792b553b75c0572 | |
| parent | urlparse.urljoin() only works correctly with recognized protocols and (diff) | |
| download | portage-660acdf48a0521ec527dd3187470b62a315eae43.tar.gz portage-660acdf48a0521ec527dd3187470b62a315eae43.tar.bz2 portage-660acdf48a0521ec527dd3187470b62a315eae43.zip | |
When the Binpkg class has fetched a package in --fetchonly mode, wait until
after the package is verified and injected before returning. (trunk r12193)
svn path=/main/branches/2.1.6/; revision=12226
| -rw-r--r-- | pym/_emerge/__init__.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 4349459fe..14dc6bb10 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -3192,11 +3192,7 @@ class Binpkg(CompositeTask): # --getbinpkg is enabled. if fetcher.returncode is not None: self._fetched_pkg = True - if self.opts.fetchonly: - self._final_exit(fetcher) - self.wait() - return - elif self._default_exit(fetcher) != os.EX_OK: + if self._default_exit(fetcher) != os.EX_OK: self.wait() return @@ -3229,6 +3225,12 @@ class Binpkg(CompositeTask): if self._fetched_pkg: self._bintree.inject(pkg.cpv, filename=pkg_path) + if self.opts.fetchonly: + self._current_task = None + self.returncode = os.EX_OK + self.wait() + return + msg = " === (%s of %s) Merging Binary (%s::%s)" % \ (pkg_count.curval, pkg_count.maxval, pkg.cpv, pkg_path) short_msg = "emerge: (%s of %s) %s Merge Binary" % \ |