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

try conving name for pkg

Browse Source
This commit is contained in:
Louis Abel 2024-02-23 10:53:25 -07:00
parent f3213dafaf
commit 45abe82b40
Signed by: label
GPG Key ID: 2A6975660E424560
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pv2/importer/operation.py
View File

@ -352,6 +352,7 @@ class SrpmImport(Import):
distprefix: str = 'el', distprefix: str = 'el',
git_user: str = 'git', git_user: str = 'git',
org: str = 'rpms', org: str = 'rpms',
preconv_names: bool = False,
dest_lookaside: str = '/var/www/html/sources', dest_lookaside: str = '/var/www/html/sources',
verify_signature: bool = False, verify_signature: bool = False,
aws_access_key_id: str = '', aws_access_key_id: str = '',
@ -373,7 +374,12 @@ class SrpmImport(Import):
self.__dest_lookaside = dest_lookaside self.__dest_lookaside = dest_lookaside
pkg_name = self.__srpm_metadata['name'] pkg_name = self.__srpm_metadata['name']
git_url = f'ssh://{git_user}@{git_url_path}/{org}/{pkg_name}.git'
package_name = pkg_name
if preconv_names:
package_name = pkg_name.replace('+', 'plus')
git_url = f'ssh://{git_user}@{git_url_path}/{org}/{package_name}.git'
self.__git_url = git_url self.__git_url = git_url
file_name_search_srpm_res = re.search(r'.*?\.src\.rpm$', file_name_search_srpm_res = re.search(r'.*?\.src\.rpm$',
@ -546,6 +552,14 @@ class SrpmImport(Import):
""" """
return self.__srpm_metadata['name'] return self.__srpm_metadata['name']
@property
def rpm_name_replace(self):
"""
Returns name of srpm
"""
new_name = self.__srpm_metadata['name'].replace('+', 'plus')
return new_name
@property @property
def rpm_version(self): def rpm_version(self):
""" """
@ -575,14 +589,6 @@ class SrpmImport(Import):
return False return False
@property
def rpm_name_replace(self):
"""
Returns a "fixed" version of the RPM name
"""
new_name = self.__srpm_metadata['name'].replace('+', 'plus')
return new_name
@property @property
def distprefix(self): def distprefix(self):
""" """