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

pkgset: Use release number of a module

Browse source 
Signed-off-by: Martin Curlej <mcurlej@redhat.com>

updated regex, added comment, pep8 fix
This commit is contained in:
Martin Curlej 2017-06-20 16:26:30 +02:00
parent 65bc6969e2
commit 079454c502
2 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
pungi/phases/pkgset/sources/source_koji.py
View file

@ -17,6 +17,7 @@
import os
import cPickle as pickle
import json
import re
import pungi.wrappers.kojiwrapper
import pungi.phases.pkgset.pkgsets
@ -52,11 +53,29 @@ def get_pdc_client_session(compose):
def variant_dict_from_str(module_str):
module_info = {}
"""
Method which parses module NVR string, defined in a variants file and returns
a module info dictionary instead.
release_start = module_str.rfind('-')
module_info['variant_version'] = module_str[release_start+1:]
module_info['variant_id'] = module_str[:release_start]
Attributes:
module_str: string, the NV(R) of module defined in a variants file.
"""
module_info = {}
# The regex is matching a string which should represent the release number
# of a module. The release number is in format: "%Y%m%d%H%M%S"
release_regex = re.compile("^(\d){14}$")
section_start = module_str.rfind('-')
module_str_first_part = module_str[section_start+1:]
if release_regex.match(module_str_first_part):
module_info['variant_release'] = module_str_first_part
module_str = module_str[:section_start]
section_start = module_str.rfind('-')
module_info['variant_version'] = module_str[section_start+1:]
else:
module_info['variant_version'] = module_str_first_part
module_info['variant_id'] = module_str[:section_start]
module_info['variant_type'] = 'module'
return module_info