robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #321 Add support for top-level variant IDs with dashes.

Browse source
This commit is contained in:
Dennis Gilmore 2016-06-06 11:56:27 +00:00
commit 469c275670
4 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pungi/metadata.py
View file

@ -94,7 +94,8 @@ def compose_to_composeinfo(compose):
return None
# variant details
var.id = variant.id
# remove dashes from variant ID, rely on productmd verification
var.id = variant.id.replace("-", "")
var.uid = variant.uid
var.name = variant.name
var.type = variant.type
@ -230,7 +231,8 @@ def write_tree_info(compose, arch, variant, timestamp=None):
var.name = variant.parent.name
var.type = "variant"
else:
var.id = variant.id
# remove dashes from variant ID, rely on productmd verification
var.id = variant.id.replace("-", "")
var.uid = variant.uid
var.name = variant.name
var.type = variant.type

2
pungi/wrappers/variants.py
View file

@ -198,8 +198,6 @@ class VariantsXmlParser(object):
class Variant(object):
def __init__(self, id, name, type, arches, groups, environments=None,
buildinstallpackages=None, is_empty=False, parent=None):
if not id.isalnum():
raise ValueError("Variant ID must contain only alphanumeric characters: %s" % id)
environments = environments or []
buildinstallpackages = buildinstallpackages or []