From 4ba70a3fd86a764b8af8172e3bdda83edf967f25 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Tue, 8 Oct 2024 16:28:50 +0200
Subject: [PATCH] git.get_upstream_remote: add fallback code path (MR 2429) (MR
2445)
When running some commands like "pmbootstrap chroot" or even
"pmbootstrap work_migrate", pmbootstrap will attempt to read the
pmaports.cfg from origin/master *before* doing the work dir migration.
In order to do this, the "get_upstream_remote" function tries to find
the upstream remote by URL. Let it search with the outdated URLs too, so
this doesn't fail right before migrating to the new URLs.
(cherry picked from commit a6d34d66b3e82cea49b2ddf7b6446edd7bc6659a)
---
pmb/helpers/git.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pmb/helpers/git.py b/pmb/helpers/git.py
index 648b2e54b..86e8f6dcd 100644
--- a/pmb/helpers/git.py
+++ b/pmb/helpers/git.py
@@ -104,6 +104,15 @@ def get_upstream_remote(args, name_repo):
for line in lines:
if url in line:
return line.split("\t", 1)[0]
+
+ # Fallback to old URLs, in case the migration was not done yet
+ if name_repo == "pmaports":
+ urls_outdated = OUTDATED_GIT_REMOTES_HTTP
+ for line in lines:
+ if any(u in line.lower() for u in urls_outdated):
+ logging.warning("WARNING: pmaports has an outdated remote URL")
+ return line.split("\t", 1)[0]
+
raise RuntimeError("{}: could not find remote name for URL '{}' in git"
" repository: {}".format(name_repo, url, path))
--
GitLab