From eb64481dcd1de381405b39a4c843e1d17c30aaba Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 25 Jun 2009 06:24:33 +0000 Subject: Add a Package.metadata.properties attribute containing a list of enabled PROPERTIES values. svn path=/main/trunk/; revision=13692 --- pym/_emerge/depgraph.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'pym/_emerge/depgraph.py') 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 -- cgit v1.2.3-1-g7c22