fetch-distro: Fetch before we switch branches

Otherwise the branch we're switching to might not exist yet.

(cherry picked from commit 07a6e1db06c9603d83e4329099b87a60a35662e7)
(cherry picked from commit 503ecb4914ae11f4a1daafd844125bbd7fe20a84)

diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py
index 9fc5b1bfa62a377c1412b25d9101896ab91f3f6d..cf9658e8ad45999438edafa7b86d9bd596c285c8 100755 (executable)
--- a/tools/fetch-distro.py
+++ b/tools/fetch-distro.py
@@ -79,12 +79,12 @@ 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]
+    cmd = ['git', '-C', f'pkg/{distro}', 'fetch', 'origin', '-v',
+           f'{branch}:remotes/origin/{branch}']
     print(f"+ {shlex.join(cmd)}")
     subprocess.check_call(cmd)
 
-    cmd = ['git', '-C', f'pkg/{distro}', 'fetch', 'origin', '-v',
-           f'{branch}:remotes/origin/{branch}']
+    cmd = ['git', '-C', f'pkg/{distro}', 'switch', branch]
     print(f"+ {shlex.join(cmd)}")
     subprocess.check_call(cmd)