Fix repository deinstall logic and add unit tests for repository helpers
Some checks failed
Mark stable commit / test-unit (push) Has been cancelled
Mark stable commit / test-integration (push) Has been cancelled
Mark stable commit / test-env-virtual (push) Has been cancelled
Mark stable commit / test-env-nix (push) Has been cancelled
Mark stable commit / test-e2e (push) Has been cancelled
Mark stable commit / test-virgin-user (push) Has been cancelled
Mark stable commit / test-virgin-root (push) Has been cancelled
Mark stable commit / codesniffer-shellcheck (push) Has been cancelled
Mark stable commit / codesniffer-ruff (push) Has been cancelled
Mark stable commit / mark-stable (push) Has been cancelled
Some checks failed
Mark stable commit / test-unit (push) Has been cancelled
Mark stable commit / test-integration (push) Has been cancelled
Mark stable commit / test-env-virtual (push) Has been cancelled
Mark stable commit / test-env-nix (push) Has been cancelled
Mark stable commit / test-e2e (push) Has been cancelled
Mark stable commit / test-virgin-user (push) Has been cancelled
Mark stable commit / test-virgin-root (push) Has been cancelled
Mark stable commit / codesniffer-shellcheck (push) Has been cancelled
Mark stable commit / codesniffer-ruff (push) Has been cancelled
Mark stable commit / mark-stable (push) Has been cancelled
- Fix undefined repo_dir usage in repository deinstall action - Centralize and harden get_repo_dir with strict validation and clear errors - Expand user paths for repository base and binary directories - Add unit tests for get_repo_dir and deinstall_repos - Add comprehensive tests for resolve_repos identifier matching - Remove obsolete command resolution tests no longer applicable https://chatgpt.com/share/693d7442-c2d0-800f-9ff3-fb84d60eaeb4
This commit is contained in:
@@ -1,13 +1,32 @@
|
||||
import os
|
||||
|
||||
from pkgmgr.core.command.run import run_command
|
||||
from pkgmgr.core.repository.dir import get_repo_dir
|
||||
from pkgmgr.core.repository.identifier import get_repo_identifier
|
||||
|
||||
def deinstall_repos(selected_repos, repositories_base_dir, bin_dir, all_repos, preview=False):
|
||||
|
||||
def deinstall_repos(
|
||||
selected_repos,
|
||||
repositories_base_dir,
|
||||
bin_dir,
|
||||
all_repos,
|
||||
preview: bool = False,
|
||||
) -> None:
|
||||
for repo in selected_repos:
|
||||
repo_identifier = get_repo_identifier(repo, all_repos)
|
||||
alias_path = os.path.join(bin_dir, repo_identifier)
|
||||
|
||||
# Resolve repository directory
|
||||
repo_dir = get_repo_dir(repositories_base_dir, repo)
|
||||
|
||||
# Prefer alias if available; fall back to identifier
|
||||
alias_name = str(repo.get("alias") or repo_identifier)
|
||||
alias_path = os.path.join(os.path.expanduser(bin_dir), alias_name)
|
||||
|
||||
# Remove alias link/file (interactive)
|
||||
if os.path.exists(alias_path):
|
||||
confirm = input(f"Are you sure you want to delete link '{alias_path}' for {repo_identifier}? [y/N]: ").strip().lower()
|
||||
confirm = input(
|
||||
f"Are you sure you want to delete link '{alias_path}' for {repo_identifier}? [y/N]: "
|
||||
).strip().lower()
|
||||
if confirm == "y":
|
||||
if preview:
|
||||
print(f"[Preview] Would remove link '{alias_path}'.")
|
||||
@@ -17,10 +36,13 @@ def deinstall_repos(selected_repos, repositories_base_dir, bin_dir, all_repos, p
|
||||
else:
|
||||
print(f"No link found for {repo_identifier} in {bin_dir}.")
|
||||
|
||||
# Run make deinstall if repository exists and has a Makefile
|
||||
makefile_path = os.path.join(repo_dir, "Makefile")
|
||||
if os.path.exists(makefile_path):
|
||||
print(f"Makefile found in {repo_identifier}, running 'make deinstall'...")
|
||||
try:
|
||||
run_command("make deinstall", cwd=repo_dir, preview=preview)
|
||||
except SystemExit as e:
|
||||
print(f"[Warning] Failed to run 'make deinstall' for {repo_identifier}: {e}")
|
||||
print(
|
||||
f"[Warning] Failed to run 'make deinstall' for {repo_identifier}: {e}"
|
||||
)
|
||||
|
||||
@@ -1,15 +1,48 @@
|
||||
import sys
|
||||
import os
|
||||
import sys
|
||||
from typing import Any, Dict
|
||||
|
||||
def get_repo_dir(repositories_base_dir:str,repo:{})->str:
|
||||
try:
|
||||
return os.path.join(repositories_base_dir, repo.get("provider"), repo.get("account"), repo.get("repository"))
|
||||
except TypeError as e:
|
||||
if repositories_base_dir:
|
||||
print(f"Error: {e} \nThe repository {repo} seems not correct configured.\nPlease configure it correct.")
|
||||
for key in ["provider","account","repository"]:
|
||||
if not repo.get(key,False):
|
||||
print(f"Key '{key}' is missing.")
|
||||
else:
|
||||
print(f"Error: {e} \nThe base {base} seems not correct configured.\nPlease configure it correct.")
|
||||
sys.exit(3)
|
||||
|
||||
def get_repo_dir(repositories_base_dir: str, repo: Dict[str, Any]) -> str:
|
||||
"""
|
||||
Build the local repository directory path from:
|
||||
repositories_base_dir/provider/account/repository
|
||||
|
||||
Exits with code 3 and prints diagnostics if the input config is invalid.
|
||||
"""
|
||||
# Base dir must be set and non-empty
|
||||
if not repositories_base_dir:
|
||||
print(
|
||||
"Error: repositories_base_dir is missing.\n"
|
||||
"The base directory for repositories seems not correctly configured.\n"
|
||||
"Please configure it correctly."
|
||||
)
|
||||
sys.exit(3)
|
||||
|
||||
# Repo must be a dict-like object
|
||||
if not isinstance(repo, dict):
|
||||
print(
|
||||
f"Error: invalid repo object '{repo}'.\n"
|
||||
"The repository entry seems not correctly configured.\n"
|
||||
"Please configure it correctly."
|
||||
)
|
||||
sys.exit(3)
|
||||
|
||||
base_dir = os.path.expanduser(str(repositories_base_dir))
|
||||
|
||||
provider = repo.get("provider")
|
||||
account = repo.get("account")
|
||||
repository = repo.get("repository")
|
||||
|
||||
missing = [k for k, v in [("provider", provider), ("account", account), ("repository", repository)] if not v]
|
||||
if missing:
|
||||
print(
|
||||
"Error: repository entry is missing required keys.\n"
|
||||
f"Repository: {repo}\n"
|
||||
"Please configure it correctly."
|
||||
)
|
||||
for k in missing:
|
||||
print(f"Key '{k}' is missing.")
|
||||
sys.exit(3)
|
||||
|
||||
return os.path.join(base_dir, str(provider), str(account), str(repository))
|
||||
|
||||
Reference in New Issue
Block a user