summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-08-05 04:30:56 +0000
committerZac Medico <zmedico@gentoo.org>2006-08-05 04:30:56 +0000
commit8e411e2086aad97364cde79b5a658012ace5b650 (patch)
treed4da15cf473b09c294f4878005e4c0ac41a3ea13
parent355ba706132fd529f30de75218835999441f2d64 (diff)
downloadportage-8e411e2086aad97364cde79b5a658012ace5b650.tar.gz
portage-8e411e2086aad97364cde79b5a658012ace5b650.tar.bz2
portage-8e411e2086aad97364cde79b5a658012ace5b650.zip
Add additional checks for --pretend and --fetch-all-uri to ensure correct behavior. See bug #140552.
svn path=/main/trunk/; revision=4155
-rwxr-xr-xbin/emerge8
1 files changed, 6 insertions, 2 deletions
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("!!!")