From 6a034713fb2ff9aa5be2349d001ce15161c50c60 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 24 Mar 2007 21:39:36 +0000 Subject: 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 --- bin/emerge | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/emerge b/bin/emerge index 3af57560..684f2a97 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": -- cgit v1.2.3-65-gdbad