From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 6 Jun 2024 11:23:17 +0000 (+0200)
Subject: mkosi: move variable to the right scope
X-Git-Tag: v257-rc1~1021^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3690971cd0d11749e82bc1cb69d5a1e80284ab46;p=thirdparty%2Fsystemd.git

mkosi: move variable to the right scope
---

diff --git a/mkosi.images/system/mkosi.sync b/mkosi.images/system/mkosi.sync
index d21ecd19808..fef0e3b1381 100755
--- a/mkosi.images/system/mkosi.sync
+++ b/mkosi.images/system/mkosi.sync
@@ -13,16 +13,16 @@ if [[ -d "$PKG_SUBDIR/.git" ]] && [[ "$(git -C "$PKG_SUBDIR" rev-parse HEAD)" ==
     exit 0
 fi
 
-# The repository on Salsa has the full upstream sources, so it's a waste of space to
-# redownload and duplicate everything, so do a sparse checkout as we only need the
-# packaging directory anyway
-if [[ -n "${GIT_SUBDIR:-}" ]]; then
-    sparse=(--no-checkout --filter=tree:0)
-else
-    sparse=()
-fi
-
 if [[ ! -e "$PKG_SUBDIR" ]] || [[ -z "$(ls --almost-all "$PKG_SUBDIR")" ]]; then
+    # The repository on Salsa has the full upstream sources, so it's a waste of
+    # space to redownload and duplicate everything, so do a sparse checkout as
+    # we only need the packaging directory anyway.
+    if [[ -n "${GIT_SUBDIR:-}" ]]; then
+        sparse=(--no-checkout --filter=tree:0)
+    else
+        sparse=()
+    fi
+
     git clone "$GIT_URL" --branch "$GIT_BRANCH" "${sparse[@]}" "$PKG_SUBDIR"
     if [[ -n "${GIT_SUBDIR:-}" ]]; then
         # --no-cone is needed to check out only one top-level directory