From 1c85d56349da7943967377e45da595e32887e0a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 3 Jul 2024 16:11:43 +0200 Subject: [PATCH] tools/fetch-distro: switch to the target branch We switch opensuse from "factory" to "devel". I had an old checkout that was using the stale branch. --- tools/fetch-distro.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py index e7f9f59104e..9fc5b1bfa62 100755 --- a/tools/fetch-distro.py +++ b/tools/fetch-distro.py @@ -79,6 +79,10 @@ def update_distro(args, distro: str, config: dict): branch = config['Environment']['GIT_BRANCH'] old_commit = config['Environment']['GIT_COMMIT'] + cmd = ['git', '-C', f'pkg/{distro}', 'switch', branch] + print(f"+ {shlex.join(cmd)}") + subprocess.check_call(cmd) + cmd = ['git', '-C', f'pkg/{distro}', 'fetch', 'origin', '-v', f'{branch}:remotes/origin/{branch}'] print(f"+ {shlex.join(cmd)}") -- 2.47.3