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

svn path=/main/trunk/; revision=6273

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 11cb50a479390ae8fc0f9af16e1eb669a12715e7..b99ff27242243422207c53cc648c1bbc9b9d0e68 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2922,6 +2922,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":