summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-01 08:39:24 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-01 08:39:24 +0000
commit890becf9732d9a0d3ecdc8be662c8453b731a4c7 (patch)
treef2201a9a66b4dc2e606091b03225f42525014df5 /bin
parentd08d7e79e2e12d0be112bb64964497f1fc19ce85 (diff)
downloadportage-890becf9732d9a0d3ecdc8be662c8453b731a4c7.tar.gz
portage-890becf9732d9a0d3ecdc8be662c8453b731a4c7.tar.bz2
portage-890becf9732d9a0d3ecdc8be662c8453b731a4c7.zip
Revert --buildpkgonly logic back because it was already correct. (trunk r7110)
svn path=/main/branches/2.1.2/; revision=7111
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index ba0937e4a..bf33f5839 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_SOFT):
+ not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
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_SOFT):
+ if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
print "\n!!! --buildpkgonly requires all dependencies to be merged."
print "!!! Cannot merge requested packages. Merge deps and try again.\n"
sys.exit(1)