summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/__init__.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 617a81ec1..248d28173 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3211,11 +3211,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
@@ -3248,6 +3244,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" % \