Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] parse_metadata_use: prefer first language found (bug 599060)
Date: Sun, 06 Nov 2016 20:21:01
Message-Id: 1478463469-30107-1-git-send-email-zmedico@gentoo.org
1 Descriptions may exist for multiple languages, so ignore all except
2 the first description found, so that use.local.desc content is
3 consistent.
4
5 X-Gentoo-Bug: 599060
6 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=599060
7 ---
8 pym/portage/xml/metadata.py | 4 +++-
9 1 file changed, 3 insertions(+), 1 deletion(-)
10
11 diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
12 index 4940bfb..ae9d193 100644
13 --- a/pym/portage/xml/metadata.py
14 +++ b/pym/portage/xml/metadata.py
15 @@ -452,7 +452,9 @@ def parse_metadata_use(xml_tree):
16
17 for flag in flags:
18 pkg_flag = flag.get("name")
19 - if pkg_flag is not None:
20 + # Descriptions may exist for multiple languages, so ignore
21 + # all except the first description found (see bug 599060).
22 + if pkg_flag is not None and pkg_flag not in uselist:
23 flag_restrict = flag.get("restrict")
24
25 # emulate the Element.itertext() method from python-2.7
26 --
27 2.7.4

Replies