peridot/pv2
7
0
Fork 0
mirror of https://github.com/peridotbuild/pv2.git synced 2024-11-24 14:11:25 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

strip off -rhel-* before getting name

Browse Source
This commit is contained in:
Louis Abel 2023-07-07 20:21:10 -07:00
parent d1e9bbb109
commit 7e4c13657b
Signed by: label
GPG Key ID: 3331F061D1D9990E
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pv2/importer/operation.py
View File

@ -238,12 +238,13 @@ class Import:
""" """
Returns a branch name for modules Returns a branch name for modules
""" """
regex = r'stream-([a-zA-Z0-9_\.]+)-([a-zA-Z0-9_\.]+)' branch_fix = re.sub(r'-rhel-\d+\.\d+\.\d+', '', source_branch)
regex_search = re.search(regex, source_branch) regex = r'stream-([a-zA-Z0-9_\.-]+)-([a-zA-Z0-9_\.]+)'
regex_search = re.search(regex, branch_fix)
return regex_search.group(2) return regex_search.group(2)
@staticmethod @staticmethod
def get_module_stream_version(release, source_branch, timestamp): def get_module_stream_os(release, source_branch, timestamp):
""" """
Returns a code of major, minor, micro version if applicable Returns a code of major, minor, micro version if applicable
""" """
@ -855,9 +856,7 @@ class ModuleImport(Import):
raise err.GitInitError('Upstream git repo does not exist') raise err.GitInitError('Upstream git repo does not exist')
dest_branch = f'{dest_branch}-stream-{stream_name}' dest_branch = f'{dest_branch}-stream-{stream_name}'
module_version = self.get_module_stream_version(self.release, module_version = self.get_module_stream_os(self.release, source_branch, self.datestamp)
source_branch,
self.datestamp)
nsvc = f'{self.module_name}-{stream_name}-{module_version}.deadbeef' nsvc = f'{self.module_name}-{stream_name}-{module_version}.deadbeef'
import_tag = generic.safe_encoding( import_tag = generic.safe_encoding(
f'imports/{dest_branch}/{nsvc}' f'imports/{dest_branch}/{nsvc}'