From: Zack Cerza <zack@cerza.org>
Date: Wed, 5 Mar 2025 21:40:55 +0000 (-0700)
Subject: make-debs.sh: Optionally avoid make-dist
X-Git-Tag: testing/wip-jcollin-testing-20250820.041311-squid~20^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b04ff11dafe3ed2d6bf3aed3cc7581e656a5ddc;p=ceph-ci.git

make-debs.sh: Optionally avoid make-dist

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit 6455b99f3228db0f4d742b1cd0cce3586af00cec)
---

diff --git a/make-debs.sh b/make-debs.sh
index 6857b211736..99180f6fd59 100755
--- a/make-debs.sh
+++ b/make-debs.sh
@@ -23,17 +23,17 @@ rm -fr $(dirname $releasedir)
 #
 # remove all files not under git so they are not
 # included in the distribution.
-#
-git clean -dxf
-#
+
+[ -e .git ] && git clean -dxf
+
 # git describe provides a version that is
 # a) human readable
 # b) is unique for each commit
 # c) compares higher than any previous commit
 # d) contains the short hash of the commit
 #
-vers=$(git describe --match "v*" | sed s/^v//)
-./make-dist $vers
+vers=${2:-$(git describe --match "v*" | sed s/^v//)}
+test -f "ceph-$vers.tar.bz2" || ./make-dist $vers
 #
 # rename the tarbal to match debian conventions and extract it
 #