From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 26 Aug 2010 22:54:44 +0000 (-0700)
Subject: Make parse_metadata_use() tolerate empty flag descriptions.
X-Git-Tag: v2.2_rc70~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=666c4e75360313c0297d54b86f6bb07ef6b3f764;p=portage.git

Make parse_metadata_use() tolerate empty flag descriptions.
---

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 6dbdeddcd..50576d9b9 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -133,9 +133,6 @@ 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 flag.text is None:
-			raise exception.ParseError("missing USE description with " + \
-				"the 'flag' tag (name=%s)" % pkg_flag)
 
 		# emulate the Element.itertext() method from python-2.7
 		inner_text = []
@@ -152,11 +149,7 @@ def parse_metadata_use(xml_tree):
 				stack.append(obj.tail)
 			stack.extend(reversed(obj))
 
-		pkg_flag_value = " ".join("".join(inner_text).split())
-		if not pkg_flag_value:
-			raise exception.ParseError("missing USE description with " + \
-				"the 'flag' tag (name=%s)" % pkg_flag)
-		uselist[pkg_flag] = pkg_flag_value
+		uselist[pkg_flag] = " ".join("".join(inner_text).split())
 	return uselist
 
 class UnknownHerdsError(ValueError):