From 7001664d9f6cf09c07721918ecbb7a5376cc3679 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 23 Feb 2024 09:08:24 -0700 Subject: [PATCH] preconv name support for git imports --- pv2/importer/operation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pv2/importer/operation.py b/pv2/importer/operation.py index 88bde95..6362abc 100644 --- a/pv2/importer/operation.py +++ b/pv2/importer/operation.py @@ -645,11 +645,12 @@ class GitImport(Import): if source_git_protocol == 'ssh': full_source_git_url_path = f'{source_git_user}@{source_git_url_path}' + package_name = package if preconv_names: - package = package.replace('+', 'plus') + package_name = package.replace('+', 'plus') - self.__source_git_url = f'{source_git_protocol}://{full_source_git_url_path}/{source_git_org_path}/{package}.git' - self.__dest_git_url = f'ssh://{dest_git_user}@{dest_git_url_path}/{dest_org}/{package}.git' + self.__source_git_url = f'{source_git_protocol}://{full_source_git_url_path}/{source_git_org_path}/{package_name}.git' + self.__dest_git_url = f'ssh://{dest_git_user}@{dest_git_url_path}/{dest_org}/{package_name}.git' self.__dist_prefix = distprefix self.__dist_tag = f'.{distprefix}{release}' self.__source_branch = source_branch