From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Mar 2007 21:39:36 +0000 (-0000)
Subject: Allow the merge task to continue despite conflicts when --fetch-all-uri is specified... 
X-Git-Tag: v2.1.2.3~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a034713fb2ff9aa5be2349d001ce15161c50c60;p=portage.git

Allow the merge task to continue despite conflicts when --fetch-all-uri is specified. (trunk r6272:6273)

svn path=/main/branches/2.1.2/; revision=6274
---

diff --git a/bin/emerge b/bin/emerge
index 3af575601..684f2a978 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2894,6 +2894,7 @@ class MergeTask(object):
 
 		#check for blocking dependencies
 		if "--fetchonly" not in self.myopts and \
+			"--fetch-all-uri" not in self.myopts and \
 			"--buildpkgonly" not in self.myopts:
 			for x in mylist:
 				if x[0]=="blocks":