almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

- Truncate a volume ID to 32 bytes

Browse Source 
- Add new architecture `x86_64_v2`
This commit is contained in:
Stepan Oksanichenko 2024-09-06 22:28:38 +03:00
parent 72635cf5c1
commit cb53de3c46
Signed by: soksanichenko
GPG Key ID: AB9983172AB1E45B
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/arch_utils.py
View File

@ -34,6 +34,8 @@ arches = {
"x86_64": "athlon", "x86_64": "athlon",
"amd64": "x86_64", "amd64": "x86_64",
"ia32e": "x86_64", "ia32e": "x86_64",
# x86-64-v2
"x86_64_v2": "noarch",
# ppc64le # ppc64le
"ppc64le": "noarch", "ppc64le": "noarch",
# ppc # ppc

5
pungi/util.py
View File

@ -487,10 +487,7 @@ def get_volid(compose, arch, variant=None, disc_type=False, formats=None, **kwar
tried.add(volid) tried.add(volid)
if volid and len(volid) > 32: if volid and len(volid) > 32:
raise ValueError( volid = volid[:32]
"Could not create volume ID longer than 32 bytes, options are %r",
sorted(tried, key=len),
)
if compose.conf["restricted_volid"]: if compose.conf["restricted_volid"]:
# Replace all non-alphanumeric characters and non-underscores) with # Replace all non-alphanumeric characters and non-underscores) with