diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:38:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:38:35 +0000 |
| commit | 6fef0444c727b18e9a768187e2c96a2db428d1c8 (patch) | |
| tree | c0218779197f91f4e557d4942dfacc76dab33643 | |
| parent | c500d95c62811ae0c73b47806225fd5cafca835f (diff) | |
| download | portage-6fef0444c727b18e9a768187e2c96a2db428d1c8.tar.gz portage-6fef0444c727b18e9a768187e2c96a2db428d1c8.tar.bz2 portage-6fef0444c727b18e9a768187e2c96a2db428d1c8.zip | |
Allow the merge task to continue despite conflicts when --fetch-all-uri is specified.
svn path=/main/trunk/; revision=6273
| -rw-r--r-- | pym/emerge/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
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": |