From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 3 Jul 2024 14:11:43 +0000 (+0200)
Subject: tools/fetch-distro: switch to the target branch
X-Git-Tag: v257-rc1~850^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F33597%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

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)}")