summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-10 00:11:38 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-10 00:11:38 +0000
commitd360b4128129bb59f5a1c61dbe7d0141dfcb19cf (patch)
tree29c585788599910c965d31fae303e292424675ae
parente160100049ae52dbca16eab8582da865d27b94ad (diff)
downloadportage-d360b4128129bb59f5a1c61dbe7d0141dfcb19cf.tar.gz
portage-d360b4128129bb59f5a1c61dbe7d0141dfcb19cf.tar.bz2
portage-d360b4128129bb59f5a1c61dbe7d0141dfcb19cf.zip
Escape a newline from the previous commit.
svn path=/main/trunk/; revision=5247
-rwxr-xr-xbin/emerge2
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: