From bb38d0c563c75cdb6c7294ae41ecc61fc9f04f1f Mon Sep 17 00:00:00 2001 From: Andrei <16517508+anvacaru@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:00:36 +0200 Subject: [PATCH 1/2] use the base repo path --- src/kup/__main__.py | 3 ++- src/kup/package.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/kup/__main__.py b/src/kup/__main__.py index 78741e8..7c56072 100644 --- a/src/kup/__main__.py +++ b/src/kup/__main__.py @@ -276,7 +276,8 @@ def reload_packages(load_versions: bool = True) -> None: available_package = lookup_available_package(m['attrPath']) if available_package is not None: repo_path, _ = available_package.repo_path_with_access() - if 'url' in m and m['url'].startswith(repo_path): + base_repo_path = available_package.base_repo_path + if 'url' in m and m['url'].startswith(base_repo_path): packages[available_package.package_name.base] = ConcretePackage.parse( m['url'], available_package, idx, load_versions ) diff --git a/src/kup/package.py b/src/kup/package.py index eb76867..7222a77 100644 --- a/src/kup/package.py +++ b/src/kup/package.py @@ -115,6 +115,10 @@ def uri(self) -> str: path, _ = self.repo_path_with_access() return f'{path}#{self.package_name}' + @property + def base_repo_path(self) -> str: + return f'github:{self.org}/{self.repo}' + def concrete( self, override_branch_tag_commit_or_path: Optional[str] = None, ext: Optional[Iterable[str]] = None ) -> Union['ConcretePackage', 'LocalPackage']: From 82e9e19436336645383c320c92fcfef82ced32d1 Mon Sep 17 00:00:00 2001 From: Andrei <16517508+anvacaru@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:03:12 +0200 Subject: [PATCH 2/2] remove unused vars --- src/kup/__main__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/kup/__main__.py b/src/kup/__main__.py index 7c56072..ddbfb26 100644 --- a/src/kup/__main__.py +++ b/src/kup/__main__.py @@ -275,7 +275,6 @@ def reload_packages(load_versions: bool = True) -> None: if 'attrPath' in m and m['attrPath']: available_package = lookup_available_package(m['attrPath']) if available_package is not None: - repo_path, _ = available_package.repo_path_with_access() base_repo_path = available_package.base_repo_path if 'url' in m and m['url'].startswith(base_repo_path): packages[available_package.package_name.base] = ConcretePackage.parse(