mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

use shorthash to avoid race when using a branch name

Browse Source 
(cherry picked from commit fe35097681)
This commit is contained in:
Mark Andrews
2016-03-24 12:58:18 +11:00
parent b1888f0e2e
commit 3a88873c5b
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
util/kit.sh
View File

@@ -77,21 +77,6 @@ cd $tmpdir || {
exit 1
}
verdir=bind9-kit.$$
mkdir $verdir || {
echo "$0: could not create directory $tmpdir/$verdir" >&2
exit 1
}
git archive --format=tar $remote $tag version | ( cd $verdir ;tar xf - )
test -f $verdir/version || {
echo "$0: could not get 'version' file" >&2
exit 1
}
. $verdir/version
rm $verdir/version
rmdir $verdir
shorthash=`git ls-remote $repo refs/heads/$tag | cut -c1-7`
if [ -z "$shorthash" ]; then
shorthash=`git ls-remote $repo refs/tags/$tag | cut -c1-7`
@@ -101,6 +86,21 @@ if [ -z "$shorthash" ]; then
exit 1
fi
verdir=bind9-kit.$$
mkdir $verdir || {
echo "$0: could not create directory $tmpdir/$verdir" >&2
exit 1
}
git archive --format=tar $remote $shorthash version | ( cd $verdir ;tar xf - )
test -f $verdir/version || {
echo "$0: could not get 'version' file" >&2
exit 1
}
. $verdir/version
rm $verdir/version
rmdir $verdir
if $snapshot
then
RELEASETYPE=s
@@ -120,7 +120,7 @@ test ! -d $topdir || {
mkdir $topdir || exit 1
git archive --format=tar $remote $tag | ( cd $topdir; tar xf -)
git archive --format=tar $remote $shorthash | ( cd $topdir; tar xf -)
cd $topdir || exit 1