Skip to content

Commit 74a3f52

Browse files
committed
creae_tarball: fix prev git hash regexp
Prevent spurrious/useless duplicate creation of a nightly tarball by fixing the regular expression used to parse out the git hash from the last snapshot filename. Signed-off-by: Jeff Squyres <[email protected]>
1 parent 08c177e commit 74a3f52

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/nightly/create_tarball.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ if test -f "$destdir/latest_snapshot.txt"; then
195195
# Snip the timestamp out of the versions and compare just
196196
# ${BRANCHNAME}-${SHORTHASH}.
197197
compare_version="$gitbranch-$githash"
198-
compare_snapshot_version=`echo $snapshot_version | perl -pi -e 's/^([a-z]+)-(\d+)-(.*+)$/$1-$3/'`
198+
compare_snapshot_version=`echo $snapshot_version | perl -p -e 's/^(.+?)-(\d+)-(.*+)$/$1-$3/'`
199199
if test "$compare_version" = "$compare_snapshot_version"; then
200200
if test -n "$debug"; then
201201
echo "*** Our branch/git hash is the same as the last snapshot -- not doing anything"

0 commit comments

Comments
 (0)