[gentoo-portage-dev] [PATCH v2] parse_metadata_use: prefer first language found (bug 599060)

[Zac Medico]

Descriptions may exist for multiple languages, so ignore all except
the first description found for a particular value of restrict, so
that use.local.desc content is consistent.

X-Gentoo-Bug: 599060
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=599060
---
 pym/portage/xml/metadata.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

[PATCH v2] fix to handle multiple values of restrict

diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
index 4940bfb..1bc1c78 100644
--- a/pym/portage/xml/metadata.py
+++ b/pym/portage/xml/metadata.py
@@ -455,6 +455,16 @@ def parse_metadata_use(xml_tree):
 			if pkg_flag is not None:
 				flag_restrict = flag.get("restrict")
 
+				# Descriptions may exist for multiple languages, so
+				# ignore all except the first description found for a
+				# particular value of restrict (see bug 599060).
+				try:
+					uselist[pkg_flag][flag_restrict]
+				except KeyError:
+					pass
+				else:
+					continue
+
 				# emulate the Element.itertext() method from python-2.7
 				inner_text = []
 				stack = []
-- 
2.7.4