diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-11-07 02:55:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-11-07 02:55:40 +0000 |
| commit | 710a804066038579a153128d4d877911af061acb (patch) | |
| tree | a8f65358a9dd0aa0e8f85ae160566bf616c3d528 | |
| parent | b46477f5c9ae4609741841aed7660f320b8344db (diff) | |
| download | portage-710a804066038579a153128d4d877911af061acb.tar.gz portage-710a804066038579a153128d4d877911af061acb.tar.bz2 portage-710a804066038579a153128d4d877911af061acb.zip | |
Fix validate_blockers() so that a package doesn't block itself via a virtual that it provides.
svn path=/main/trunk/; revision=4968
| -rwxr-xr-x | bin/emerge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index cae410dfb..7358c8ec2 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1449,7 +1449,7 @@ class depgraph: blocked_after_update = self.mydbapi[myroot].match(mydep) if not blocked_pkgs and not blocked_after_update: del self.blocker_parents[blocker] - elif not blocked_after_update: + else: """It may be possible to circumvent this block via correct ordering of upgrades. If necessary, create hard deps to enforce correct merge order.""" |