diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-01 08:35:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-01 08:35:12 +0000 |
| commit | d08d7e79e2e12d0be112bb64964497f1fc19ce85 (patch) | |
| tree | a731f8a1da4276b19b2fc0b7c1229ec09affe19e /bin | |
| parent | 58b6a13f7398e155006e462fdc8a60bd2c1c3d3e (diff) | |
| download | portage-d08d7e79e2e12d0be112bb64964497f1fc19ce85.tar.gz portage-d08d7e79e2e12d0be112bb64964497f1fc19ce85.tar.bz2 portage-d08d7e79e2e12d0be112bb64964497f1fc19ce85.zip | |
Update --buildpkgonly logic to account for DepPriority.MEDIUM_SOFT. (trunk r7108)
svn path=/main/branches/2.1.2/; revision=7109
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index bf33f5839..ba0937e4a 100755 --- a/bin/emerge +++ b/bin/emerge @@ -5207,13 +5207,13 @@ def action_build(settings, trees, mtimedb, mydepgraph.display( mydepgraph.altlist(reversed=("--tree" in myopts))) if "--buildpkgonly" in myopts and \ - not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM): + not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM_SOFT): print "\n!!! --buildpkgonly requires all dependencies to be merged." print "!!! You have to merge the dependencies before you can build this package.\n" sys.exit(1) else: if ("--buildpkgonly" in myopts): - if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM): + if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM_SOFT): print "\n!!! --buildpkgonly requires all dependencies to be merged." print "!!! Cannot merge requested packages. Merge deps and try again.\n" sys.exit(1) |