diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index c022fb487..073f9fd42 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1471,7 +1471,7 @@ class depgraph: # node matters. In any case, this particular block is # automatically resolved. continue - if pstatus == "merge" and + if pstatus == "merge" and \ slot_atom not in blocked_slots_final.values(): upgrade_matches = final_db.match(slot_atom) if upgrade_matches: |