Allow the merge task to continue despite conflicts when --fetch-all-uri is specified...

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

diff --git a/bin/emerge b/bin/emerge
index 3af575601a666da228d4a1ae66269773f28952a6..684f2a978521e6c0b1b5154a23f4adf6df53c85d 100755 (executable)
--- 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":