From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 22 Jul 2008 03:25:08 +0000 (-0000)
Subject: Make --pretend disable background mode and imply --jobs=1.
X-Git-Tag: v2.2_rc2~9
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d80cc165c9e81906fd9fa3aaedad153d2ad5f05e;p=portage.git

Make --pretend disable background mode and imply --jobs=1.


svn path=/main/trunk/; revision=11162
---

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