From e081b9cf09a13a420ebace67b89a0a72fe88641b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 27 Aug 2010 18:47:22 +0200 Subject: Support returning multiple flag descriptions when restrict is used. Return a dict of dicts in parse_metadata_use(), with second-level keys being the restrict strings (or None when no restrict). When generating use.local.desc, use the description from the possibly-highest-matching atom. --- pym/repoman/utilities.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pym/repoman') diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py index 3df437a01..a6c24d862 100644 --- a/pym/repoman/utilities.py +++ b/pym/repoman/utilities.py @@ -135,13 +135,7 @@ def parse_metadata_use(xml_tree): pkg_flag = flag.get("name") if pkg_flag is None: raise exception.ParseError("missing 'name' attribute for 'flag' tag") - - if uselist.get(pkg_flag): - # It's possible to have multiple elements with the same - # flag name, but different 'restrict' attributes that - # specify version restrictions. We use only the first - # occurance. - continue + flag_restrict = flag.get("restrict") # emulate the Element.itertext() method from python-2.7 inner_text = [] @@ -158,7 +152,11 @@ def parse_metadata_use(xml_tree): stack.append(obj.tail) stack.extend(reversed(obj)) - uselist[pkg_flag] = " ".join("".join(inner_text).split()) + if pkg_flag not in uselist: + uselist[pkg_flag] = {} + + # (flag_restrict can be None) + uselist[pkg_flag][flag_restrict] = " ".join("".join(inner_text).split()) return uselist -- cgit v1.2.3-1-g7c22