diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-12-09 23:34:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-09 23:34:43 +0000 |
| commit | e160100049ae52dbca16eab8582da865d27b94ad (patch) | |
| tree | 6f9fbbc13cef464cdb8a827a81898a6f4a3eb7ce /bin | |
| parent | 365e2909116d8fcf3db16e3c04cbb07c7a22944e (diff) | |
| download | portage-e160100049ae52dbca16eab8582da865d27b94ad.tar.gz portage-e160100049ae52dbca16eab8582da865d27b94ad.tar.bz2 portage-e160100049ae52dbca16eab8582da865d27b94ad.zip | |
Don't attempt to enforce merge order unless the blocker parent is actually a "merge" node.
svn path=/main/trunk/; revision=5246
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 9970ad0e8..c022fb487 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1471,7 +1471,8 @@ class depgraph: # node matters. In any case, this particular block is # automatically resolved. continue - if slot_atom not in blocked_slots_final.values(): + if pstatus == "merge" and + slot_atom not in blocked_slots_final.values(): upgrade_matches = final_db.match(slot_atom) if upgrade_matches: # Apparently an upgrade may be able to invalidate |