aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-26 12:46:35 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-26 12:46:35 -0700
commit9d71e68de000d94ac627e40a7e53e77d6e53ac9a (patch)
treef1138375a8ed997489e2ebbf12665f5d4eebb832 /pym/repoman
parentegencache: Introduce the --update-use-local-desc action. (diff)
downloadportage-9d71e68de000d94ac627e40a7e53e77d6e53ac9a.tar.gz
portage-9d71e68de000d94ac627e40a7e53e77d6e53ac9a.tar.bz2
portage-9d71e68de000d94ac627e40a7e53e77d6e53ac9a.zip
Fix up error handling for egencache --update-use-local-desc.
Diffstat (limited to 'pym/repoman')
-rw-r--r--pym/repoman/utilities.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index ed0de4449..b2d17fc9a 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -131,11 +131,15 @@ def parse_metadata_use(xml_tree):
for flag in flags:
pkg_flag = flag.get("name")
- pkg_flag_value = whitespace_re.sub(' ', flag.text).strip()
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)
+ pkg_flag_value = whitespace_re.sub(' ', flag.text).strip()
if not pkg_flag_value:
- raise exception.ParseError("missing USE description with the 'flag' tag")
+ raise exception.ParseError("missing USE description with " + \
+ "the 'flag' tag (name=%s)" % pkg_flag)
uselist[pkg_flag] = pkg_flag_value
return uselist