Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
7d233c40
Commit
7d233c40
authored
Sep 30, 2018
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmbs: fix TAG var conflict
parent
37ec3d1e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
rpmbs
bin/rpmbs
+5
-5
No files found.
bin/rpmbs
View file @
7d233c40
...
...
@@ -22,7 +22,7 @@ load_mod rpm tarball alt git web buildsrpm branch
SIGN
=
SIGNTAG
=
TAG
=
SET
TAG
=
FORCE
=
UPLOADNOW
=
CHECKONLY
=
...
...
@@ -77,7 +77,7 @@ while getopts :hfstTcudenop:a:Ab:z opt; do
h
)
phelp
;
exit
0
;;
s
)
SIGN
=
1
;;
t
)
SIGNTAG
=
1
;;
T
)
TAG
=
1
;;
T
)
SET
TAG
=
1
;;
e
)
TESTONLY
=
"--test-only"
;
UPLOADNOW
=
1
;
SIGN
=
1
;;
f
)
FORCE
=
"-f"
;;
# FIXME: handle SIGN separately
...
...
@@ -115,13 +115,13 @@ __gear_create_tag()
local
GEARCTAG
=
gear-create-tag
if
[
"
$1
"
=
"pipe"
]
;
then
shift
if
[
-n
"
$TAG
"
]
;
then
if
[
-n
"
$
SET
TAG
"
]
;
then
a
=
git tag
$FORCE
"
$VERSION
-
$RELEASE
"
-m
"
$BASENAME
$VERSION
-
$RELEASE
"
"
$@
"
2>&1
return
fi
$GEARCTAG
$FORCE
-n
"
$VERSION
-
$RELEASE
"
-m
"
$BASENAME
$VERSION
-
$RELEASE
"
"
$@
"
2>&1
else
if
[
-n
"
$TAG
"
]
;
then
if
[
-n
"
$
SET
TAG
"
]
;
then
docmd git tag
$FORCE
"
$VERSION
-
$RELEASE
"
-m
"
$BASENAME
$VERSION
-
$RELEASE
"
"
$@
"
return
fi
...
...
@@ -243,7 +243,7 @@ CURDIR=`pwd`
# see functions/alt:set_binaryrepo() for BINARYREPONAME
set_binaryrepo
$MENV
if
[
-n
"
$SIGNTAG$TAG
"
]
;
then
if
[
-n
"
$SIGNTAG$
SET
TAG
"
]
;
then
for
ln
in
$LISTNAMES
;
do
if
set_usebranch
;
then
checkout_usebranch
||
fatal
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment