diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-31 23:53:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-31 23:53:14 +0000 |
| commit | ae7f8109fcb80b6ebd466a64a0be5cb7eabf2713 (patch) | |
| tree | 52deea35b874ee3516fece7cdb19b774ae4f5bb7 | |
| parent | b6c67eb366257312bbfda9a87221b252f647010b (diff) | |
| download | portage-ae7f8109fcb80b6ebd466a64a0be5cb7eabf2713.tar.gz portage-ae7f8109fcb80b6ebd466a64a0be5cb7eabf2713.tar.bz2 portage-ae7f8109fcb80b6ebd466a64a0be5cb7eabf2713.zip | |
When deps are forced to be satisfied by installed packages due to masking
or unavailability, only tolerate it when the atom comes from either the
system or world set since otherwise it's a good idea to bail so that the
user can correct the problem. (trunk r9656)
svn path=/main/branches/2.1.2/; revision=9657
| -rwxr-xr-x | bin/emerge | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index 931b04132..543309d4f 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2076,12 +2076,9 @@ class depgraph: return False, myfavorites if pkg.installed and "selective" not in self.myparams: - # Previous behavior was to bail out in this case, but - # since the dep is satisfied by the installed package, - # it's more friendly to continue building the graph - # and just show a warning message. self._unsatisfied_deps_for_display.append( ((myroot, myatom), {"myparent":None})) + return 0, myfavorites try: self.mysd = self.create(pkg, None) @@ -3104,7 +3101,9 @@ class depgraph: # Previous behavior was to bail out in this case, but # since the dep is satisfied by the installed package, # it's more friendly to continue building the graph - # and just show a warning message. + # and just show a warning message. Therefore, only bail + # out here if the atom is not from either the system or + # world set. self._unsatisfied_deps_for_display.append( ((myroot, mydep), {"myparent":None})) |