summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-17 10:38:43 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-17 10:38:43 +0000
commit88235de1a7aec5e8ea35e487df45de41b34cae6b (patch)
tree9ead3eac8a7b74b77603ed772a0918d76f627a74
parente06e1dbf1f677a1af4f4ea9b3e7e3ceaa6c3b5f5 (diff)
downloadportage-88235de1a7aec5e8ea35e487df45de41b34cae6b.tar.gz
portage-88235de1a7aec5e8ea35e487df45de41b34cae6b.tar.bz2
portage-88235de1a7aec5e8ea35e487df45de41b34cae6b.zip
Encapsulate altlist calls (for blockers that depend on merge order) in validate_blockers().
svn path=/main/trunk/; revision=4738
-rwxr-xr-xbin/emerge8
1 files changed, 2 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge
index cea492baf..a3277b239 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1378,6 +1378,8 @@ class depgraph:
invalidated after nodes referencing it have been merged."""
self.blocker_digraph.addnode(node, blocker)
self.digraph.remove(blocker)
+ # Validate blockers that depend on merge order.
+ self.altlist()
def altlist(self, reversed=False):
mygraph=self.digraph.copy()
@@ -3790,9 +3792,6 @@ def action_build(settings, trees, mtimedb,
mydepgraph.display(mymergelist)
prompt="Would you like to resume merging these packages?"
else:
- """ Blockers that depend on merge order must first be validated by
- altlist(reversed=False)."""
- mydepgraph.altlist()
mydepgraph.display(
mydepgraph.altlist(reversed=("--tree" in myopts)))
mergecount=0
@@ -3838,9 +3837,6 @@ def action_build(settings, trees, mtimedb,
sys.exit(0)
mydepgraph.display(mymergelist)
else:
- """ Blockers that depend on merge order must first be validated by
- altlist(reversed=False)."""
- mydepgraph.altlist()
mydepgraph.display(
mydepgraph.altlist(reversed=("--tree" in myopts)))
else: