diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:39:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:39:36 +0000 |
| commit | 6a034713fb2ff9aa5be2349d001ce15161c50c60 (patch) | |
| tree | c5e82e7c9ec0675f0c38c1e54cccafaf773be10e | |
| parent | For bug #172033, remove the obsolete QA Notice for man pages that are already... (diff) | |
| download | portage-multirepo-6a034713fb2ff9aa5be2349d001ce15161c50c60.tar.gz portage-multirepo-6a034713fb2ff9aa5be2349d001ce15161c50c60.tar.bz2 portage-multirepo-6a034713fb2ff9aa5be2349d001ce15161c50c60.zip | |
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
| -rwxr-xr-x | bin/emerge | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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": |