summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/depgraph.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-06-25 06:24:33 +0000
committerZac Medico <zmedico@gentoo.org>2009-06-25 06:24:33 +0000
commiteb64481dcd1de381405b39a4c843e1d17c30aaba (patch)
tree18fc1f1c89b71cc5e665a33eb8017bfceedb7e3c /pym/_emerge/depgraph.py
parenta15bbb69443cf6ffd5b8eee3e8f94066ee5148fe (diff)
downloadportage-eb64481dcd1de381405b39a4c843e1d17c30aaba.tar.gz
portage-eb64481dcd1de381405b39a4c843e1d17c30aaba.tar.bz2
portage-eb64481dcd1de381405b39a4c843e1d17c30aaba.zip
Add a Package.metadata.properties attribute containing a list of enabled
PROPERTIES values. svn path=/main/trunk/; revision=13692
Diffstat (limited to 'pym/_emerge/depgraph.py')
-rw-r--r--pym/_emerge/depgraph.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index e69a20278..2d9c50405 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4007,18 +4007,8 @@ class depgraph(object):
else:
return colorize("PKG_NOMERGE", pkg_str)
- try:
- properties = flatten(use_reduce(paren_reduce(
- pkg.metadata["PROPERTIES"]), uselist=pkg.use.enabled))
- except portage.exception.InvalidDependString, e:
- if not pkg.installed:
- show_invalid_depstring_notice(pkg,
- pkg.metadata["PROPERTIES"], str(e))
- del e
- return 1
- properties = []
- interactive = "interactive" in properties
- if interactive and pkg.operation == "merge":
+ if 'interactive' in pkg.metadata.properties and \
+ pkg.operation == 'merge':
addl = colorize("WARN", "I") + addl[1:]
if ordered:
counters.interactive += 1