Skip to content

E
etersoft-build-utils
Commit 7d233c40 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmbs: fix TAG var conflict

parent 37ec3d1e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
bin/rpmbs
View file @ 7d233c40
...@@ -22,7 +22,7 @@ load_mod rpm tarball alt git web buildsrpm branch ...@@ -22,7 +22,7 @@ load_mod rpm tarball alt git web buildsrpm branch
SIGN= SIGN=
SIGNTAG= SIGNTAG=
TAG= SETTAG=
FORCE= FORCE=
UPLOADNOW= UPLOADNOW=
CHECKONLY= CHECKONLY=
...@@ -77,7 +77,7 @@ while getopts :hfstTcudenop:a:Ab:z opt; do ...@@ -77,7 +77,7 @@ while getopts :hfstTcudenop:a:Ab:z opt; do
h) phelp; exit 0;; h) phelp; exit 0;;
s) SIGN=1 ;; s) SIGN=1 ;;
t) SIGNTAG=1 ;; t) SIGNTAG=1 ;;
T) TAG=1 ;; T) SETTAG=1 ;;
e) TESTONLY="--test-only" ; UPLOADNOW=1 ; SIGN=1 ;; e) TESTONLY="--test-only" ; UPLOADNOW=1 ; SIGN=1 ;;
f) FORCE="-f" ;; f) FORCE="-f" ;;
# FIXME: handle SIGN separately # FIXME: handle SIGN separately
...@@ -115,13 +115,13 @@ __gear_create_tag() ...@@ -115,13 +115,13 @@ __gear_create_tag()
local GEARCTAG=gear-create-tag local GEARCTAG=gear-create-tag
if [ "$1" = "pipe" ] ; then if [ "$1" = "pipe" ] ; then
shift shift
if [ -n "$TAG" ] ; then if [ -n "$SETTAG" ] ; then
a= git tag $FORCE "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" 2>&1 a= git tag $FORCE "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" 2>&1
return return
fi fi
$GEARCTAG $FORCE -n "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" 2>&1 $GEARCTAG $FORCE -n "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" 2>&1
else else
if [ -n "$TAG" ] ; then if [ -n "$SETTAG" ] ; then
docmd git tag $FORCE "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" docmd git tag $FORCE "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@"
return return
fi fi
...@@ -243,7 +243,7 @@ CURDIR=`pwd` ...@@ -243,7 +243,7 @@ CURDIR=`pwd`
# see functions/alt:set_binaryrepo() for BINARYREPONAME # see functions/alt:set_binaryrepo() for BINARYREPONAME
set_binaryrepo $MENV set_binaryrepo $MENV
if [ -n "$SIGNTAG$TAG" ] ; then if [ -n "$SIGNTAG$SETTAG" ] ; then
for ln in $LISTNAMES ; do for ln in $LISTNAMES ; do
if set_usebranch ; then if set_usebranch ; then
checkout_usebranch || fatal checkout_usebranch || fatal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment