Skip to content

Commit 3baf76f

Browse files
authored
Merge pull request openSUSE#1937 from openSUSE/multibuild_null_flavor
Tolarate empty flavor in multibuild resolve
2 parents f27677b + 0c3d056 commit 3baf76f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

osc/core.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6490,9 +6490,15 @@ def parse_multibuild_data(s: str):
64906490

64916491
root = xml_fromstring(s)
64926492
for node in root.findall("flavor"):
6493+
if node.text is None:
6494+
result.add("")
6495+
continue
64936496
result.add(node.text)
64946497
# <package> is deprecated according to OBS Multibuild.pm, but it is widely used
64956498
for node in root.findall("package"):
6499+
if node.text is None:
6500+
result.add("")
6501+
continue
64966502
result.add(node.text)
64976503
return result
64986504

0 commit comments

Comments
 (0)