From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 5 Aug 2006 04:30:56 +0000 (-0000)
Subject: Add additional checks for --pretend and --fetch-all-uri to ensure correct behavior... 
X-Git-Tag: v2.1.1~97
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e411e2086aad97364cde79b5a658012ace5b650;p=portage.git

Add additional checks for --pretend and --fetch-all-uri to ensure correct behavior.  See bug #140552.

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

diff --git a/bin/emerge b/bin/emerge
index 29710f11f..2bbd81076 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1773,7 +1773,9 @@ class MergeTask(object):
 							#we don't have a favorites entry for this package yet; add one
 							myfavdict[myfavkey]=myfavkey
 							print ">>> Recording",myfavkey,"in \"world\" favorites file..."
-			if "--fetchonly" not in self.myopts:
+			if not ("--fetchonly" in self.myopts or \
+				"--fetch-all-uri" in self.myopts or \
+				"--pretend" in self.myopts):
 				portage.write_atomic(
 					os.path.join(self.target_root, portage.WORLD_FILE),
 					"\n".join(myfavdict.values()))
@@ -1784,7 +1786,9 @@ class MergeTask(object):
 		myfeat = self.settings.features[:]
 
 		if "parallel-fetch" in myfeat and \
-			not ("--ask" in self.myopts or "--pretend" in self.myopts or \
+			not ("--ask" in self.myopts or \
+			"--pretend" in self.myopts or \
+			"--fetch-all-uri" in self.myopts or \
 			"--fetchonly" in self.myopts):
 			if "distlocks" not in myfeat:
 				print red("!!!")