From d360b4128129bb59f5a1c61dbe7d0141dfcb19cf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 10 Dec 2006 00:11:38 +0000 Subject: Escape a newline from the previous commit. svn path=/main/trunk/; revision=5247 --- bin/emerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') 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: -- cgit v1.2.3-1-g7c22