diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-19 18:07:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-19 18:07:49 +0000 |
| commit | 39305d2a602a6e62be1076869c5dc6a68d0631d7 (patch) | |
| tree | 47159dc07450f74275a261e7647e01d6eaf37c28 | |
| parent | 7ab300ba6272f15009f779eb20696d17cbf93f4c (diff) | |
| download | portage-39305d2a602a6e62be1076869c5dc6a68d0631d7.tar.gz portage-39305d2a602a6e62be1076869c5dc6a68d0631d7.tar.bz2 portage-39305d2a602a6e62be1076869c5dc6a68d0631d7.zip | |
For consistency, pass ignore_soft_deps into digraph.hasallzeros().
svn path=/main/trunk/; revision=4482
| -rwxr-xr-x | bin/emerge | 2 | ||||
| -rw-r--r-- | pym/portage.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 5eabf9f94..edda52ecd 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3546,7 +3546,7 @@ def action_build(settings, trees, mtimedb, mydepgraph.altlist(reversed=("--tree" in myopts))) else: if ("--buildpkgonly" in myopts): - if not mydepgraph.digraph.hasallzeros(): + if not mydepgraph.digraph.hasallzeros(ignore_soft_deps=True): print "\n!!! --buildpkgonly requires all dependencies to be merged." print "!!! Cannot merge requested packages. Merge deps and try again.\n" sys.exit(1) diff --git a/pym/portage.py b/pym/portage.py index a0e8a87bb..c7d48205d 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -444,8 +444,9 @@ class digraph: return leaf_nodes[0] return None - def hasallzeros(self): - return len(self.leaf_nodes(ignore_soft_deps=True)) == len(self.order) + def hasallzeros(self, ignore_soft_deps=False): + return len(self.leaf_nodes(ignore_soft_deps=ignore_soft_deps)) == \ + len(self.order) def debug_print(self): for node in self.nodes: |