Make --fetchonly disable background mode.
svn path=/main/trunk/; revision=11170
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0b3b2cf..7d24e16 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8644,6 +8644,10 @@
"--fetchonly", "--fetch-all-uri",
"--nodeps", "--pretend"])
+ _opts_no_background = \
+ frozenset(["--pretend",
+ "--fetchonly", "--fetch-all-uri"])
+
_opts_no_restart = frozenset(["--buildpkgonly",
"--fetchonly", "--fetch-all-uri", "--pretend"])
@@ -8819,7 +8823,7 @@
@returns: True if background mode is enabled, False otherwise.
"""
background = (self._max_jobs > 1 or "--quiet" in self.myopts) and \
- "--pretend" not in self.myopts
+ not bool(self._opts_no_background.intersection(self.myopts))
self._status_display.quiet = \
not background or \
@@ -9489,7 +9493,7 @@
# Only allow 1 job max if a restart is scheduled
# due to portage update.
if self._is_restart_scheduled() or \
- "--pretend" in self.myopts:
+ self._opts_no_background.intersection(self.myopts):
self._set_max_jobs(1)
merge_queue = self._task_queues.merge
