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
f48332a9
Commit
f48332a9
authored
Sep 29, 2017
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmbs: fix rpmbs -t
parent
66798bdc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
9 deletions
+21
-9
rpmbs
bin/rpmbs
+21
-9
No files found.
bin/rpmbs
View file @
f48332a9
...
...
@@ -154,7 +154,7 @@ check_gear_and_tag()
fi
fi
local
TAG
=
$(
get_last_tag
)
test
-z
"
$TAG
"
||
is_last_commit_tag
||
docmd git tag
-v
"
$TAG
"
||
fatal
"Tag
$TAG
still missed in the repo
"
test
-z
"
$TAG
"
||
is_last_commit_tag
||
fatal
"Tag
$TAG
is not on the last commit
"
cd
-
>
/dev/null
echo
"Tag
$TAG
is set"
return
$RESULT
...
...
@@ -221,8 +221,27 @@ prepare_rpmdir
LISTBUILT
=
""
CURDIR
=
`
pwd
`
# FIXME: need we it later?
# set SPECDIR from LISTNAMES if empty
[
-n
"
$SPECDIR
"
]
||
set_specdir
$LISTNAMES
# see functions/alt:set_binaryrepo() for BINARYREPONAME
set_binaryrepo
$MENV
if
[
-n
"
$SIGNTAG
"
]
;
then
check_gear_and_tag
for
ln
in
$LISTNAMES
;
do
if
set_usebranch
;
then
checkout_usebranch
||
fatal
fi
# check release
build_rpms_name
"
$ln
"
pkg_release_check
$RELEASE
check_gear_and_tag
checkout_original_branch
done
exit
$?
fi
...
...
@@ -231,13 +250,6 @@ if [ -n "$NOSOURCE" ] ; then
exit
$?
fi
# FIXME: need we it later?
# set SPECDIR from LISTNAMES if empty
[
-n
"
$SPECDIR
"
]
||
set_specdir
$LISTNAMES
# see functions/alt:set_binaryrepo() for BINARYREPONAME
set_binaryrepo
$MENV
# If we build from gear repo, run task
if
[
-n
"
$UPLOADNOW
"
]
&&
is_gear
$SPECDIR
;
then
...
...
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