kevinveenbirkenbach/pkgmgr
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

Solved clone bug

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-03-05 17:50:35 +01:00
parent 75b4ac4f8e
commit 241d0d6315
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
main.py
View File

@@ -266,6 +266,7 @@ def get_repo_dir(repositories_base_dir:str,repo:{})->str:
sys.exit(1) sys.exit(1)
def clone_repos(selected_repos, repositories_base_dir: str, all_repos, preview=False): def clone_repos(selected_repos, repositories_base_dir: str, all_repos, preview=False):
import subprocess # ensure subprocess is imported
for repo in selected_repos: for repo in selected_repos:
repo_identifier = get_repo_identifier(repo, all_repos) repo_identifier = get_repo_identifier(repo, all_repos)
repo_dir = get_repo_dir(repositories_base_dir, repo) repo_dir = get_repo_dir(repositories_base_dir, repo)
@@ -276,17 +277,32 @@ def clone_repos(selected_repos, repositories_base_dir: str, all_repos, preview=F
parent_dir = os.path.dirname(repo_dir) parent_dir = os.path.dirname(repo_dir)
os.makedirs(parent_dir, exist_ok=True) os.makedirs(parent_dir, exist_ok=True)
try: # Attempt SSH clone first.
target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}:{repo.get('account')}/{repo.get('repository')}" target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}:{repo.get('account')}/{repo.get('repository')}"
clone_url = f"git@{target}.git" clone_url = f"git@{target}.git"
print(f"[INFO] Attempting to clone '{repo_identifier}' using SSH from {clone_url} into '{repo_dir}'.") print(f"[INFO] Attempting to clone '{repo_identifier}' using SSH from {clone_url} into '{repo_dir}'.")
run_command(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, preview=preview)
except Exception as exception1: if preview:
print(f"[WARNING] SSH clone failed for '{repo_identifier}' (error: {exception1}). Trying HTTPS...") print(f"[Preview] Would run: git clone {clone_url} {repo_dir} in {parent_dir}")
target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}/{repo.get('account')}/{repo.get('repository')}" # Simulate a successful clone in preview mode.
clone_url = f"https://{target}.git" result = subprocess.CompletedProcess(args=[], returncode=0)
print(f"[INFO] Attempting to clone '{repo_identifier}' using HTTPS from {clone_url} into '{repo_dir}'.") else:
run_command(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, preview=preview) result = subprocess.run(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, shell=True)
# If SSH clone returns an error code, ask user whether to try HTTPS.
if result.returncode != 0:
print(f"[WARNING] SSH clone failed for '{repo_identifier}' with return code {result.returncode}.")
choice = input("Do you want to attempt HTTPS clone instead? (y/N): ").strip().lower()
if choice == 'y':
target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}/{repo.get('account')}/{repo.get('repository')}"
clone_url = f"https://{target}.git"
print(f"[INFO] Attempting to clone '{repo_identifier}' using HTTPS from {clone_url} into '{repo_dir}'.")
if preview:
print(f"[Preview] Would run: git clone {clone_url} {repo_dir} in {parent_dir}")
else:
subprocess.run(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, shell=True)
else:
print(f"[INFO] HTTPS clone not attempted for '{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=False):
for repo in selected_repos: for repo in selected_repos: