From 6fef0444c727b18e9a768187e2c96a2db428d1c8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 24 Mar 2007 21:38:35 +0000 Subject: Allow the merge task to continue despite conflicts when --fetch-all-uri is specified. svn path=/main/trunk/; revision=6273 --- pym/emerge/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'pym/emerge') diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 11cb50a47..b99ff2724 100644 --- 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": -- cgit v1.2.3-1-g7c22