diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-01 08:34:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-01 08:34:33 +0000 |
| commit | e3a1ddab25114da12656f397330455151af28929 (patch) | |
| tree | f5eab5534040cff461926a0e3aaf7d6800aeff35 | |
| parent | 5fd4df9938aa85efc849910603071f358f7b1249 (diff) | |
| download | portage-e3a1ddab25114da12656f397330455151af28929.tar.gz portage-e3a1ddab25114da12656f397330455151af28929.tar.bz2 portage-e3a1ddab25114da12656f397330455151af28929.zip | |
Update --buildpkgonly logic to account for DepPriority.MEDIUM_SOFT.
svn path=/main/trunk/; revision=7108
| -rw-r--r-- | pym/emerge/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 475105672..819919d86 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -5358,13 +5358,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) |