Skip to content

Commit

Permalink
build: fix errors in last commit
Browse files Browse the repository at this point in the history
Thanks BradleyS
  • Loading branch information
jstebbins committed Aug 25, 2015
1 parent 4889bc9 commit 9d0a09a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion make/configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ def _action( self ):
url_arch = ''

if repo.tag != '':
m = re.match( '([0-9]+)\.([0-9]+)\.([0-9]+)', repo.tag )
m = re.match( '^([0-9]+)\.([0-9]+)\.([0-9]+)$', repo.tag )
if not m:
cfg.errln( 'Invalid repo tag format %s\n', repo.tag )
sys.exit( 1 )
Expand Down
4 changes: 2 additions & 2 deletions scripts/repo-info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if [[ ${TAG} ]]; then
else
TAG=$(${GIT_EXE} describe $(${GIT_EXE} rev-list --tags --max-count=1))
if [[ ${TAG} ]]; then
REV=$(${GIT_EXE} rev-list $(${GIT_EXE} merge-base 0.10.2 HEAD).. --count)
REV=$(${GIT_EXE} rev-list $(${GIT_EXE} merge-base ${TAG} HEAD).. --count)
else
REV=$(${GIT_EXE} rev-list HEAD --count)
fi
Expand All @@ -57,7 +57,7 @@ fi
DATE=$(${GIT_EXE} log -1 --format="format:%ai")

# Output
# Only write tag and rev if they exist. A fresh clone currently has no tags.
# Only write tag and rev if they exist.
echo "URL=${URL}"
echo "HASH=${HASH}"
if [[ ${TAG} ]]; then echo "TAG=${TAG}"; fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/tag-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if [ ${ERR} -ne 0 ]; then
exit ${ERR}
fi

# creat tag
# create tag
git tag -a "${TAG}" -m "Release ${TAG}" HEAD
ERR=$?
if [ ${ERR} -ne 0 ]; then
Expand Down

0 comments on commit 9d0a09a

Please sign in to comment.