diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-22 03:25:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-22 03:25:08 +0000 |
| commit | d80cc165c9e81906fd9fa3aaedad153d2ad5f05e (patch) | |
| tree | 226ccfa185bffeb669e25907a405777baae06932 | |
| parent | 412b29b25efda0ddebe68eb67b807e45e2a8e24b (diff) | |
| download | portage-d80cc165c9e81906fd9fa3aaedad153d2ad5f05e.tar.gz portage-d80cc165c9e81906fd9fa3aaedad153d2ad5f05e.tar.bz2 portage-d80cc165c9e81906fd9fa3aaedad153d2ad5f05e.zip | |
Make --pretend disable background mode and imply --jobs=1.
svn path=/main/trunk/; revision=11162
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 60d3fe2c7..cc2c20a82 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8808,7 +8808,8 @@ class Scheduler(PollScheduler): @rtype: bool @returns: True if background mode is enabled, False otherwise. """ - background = self._max_jobs > 1 or "--quiet" in self.myopts + background = (self._max_jobs > 1 or "--quiet" in self.myopts) and \ + "--pretend" not in self.myopts self._status_display.quiet = \ not background or \ @@ -9473,7 +9474,8 @@ class Scheduler(PollScheduler): # Only allow 1 job max if a restart is scheduled # due to portage update. - if self._is_restart_scheduled(): + if self._is_restart_scheduled() or \ + "--pretend" in self.myopts: self._set_max_jobs(1) merge_queue = self._task_queues.merge |