Skip to content

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

rpmbs: convert dirs to specs before SIGNTAG block

parent 8d18d6f2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/rpmbs
View file @ dd0d945e
...@@ -293,6 +293,9 @@ EOFWRAPPER ...@@ -293,6 +293,9 @@ EOFWRAPPER
trap "rm -f '$GPG2_WRAPPER'; [ -n \"\$RESTORE_GPG_PROGRAM\" ] && git config --global --unset gpg.program" EXIT trap "rm -f '$GPG2_WRAPPER'; [ -n \"\$RESTORE_GPG_PROGRAM\" ] && git config --global --unset gpg.program" EXIT
fi fi
# convert dirs to specs before use
LISTNAMES=$(repodirs_to_specs $LISTNAMES)
if [ -n "$SIGNTAG$SETTAG" ] ; then if [ -n "$SIGNTAG$SETTAG" ] ; then
for ln in $LISTNAMES ; do for ln in $LISTNAMES ; do
if set_usebranch ; then if set_usebranch ; then
...@@ -318,9 +321,6 @@ fi ...@@ -318,9 +321,6 @@ fi
# If we build from gear repo, run task # If we build from gear repo, run task
if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
# assure we have only specs or src.rpm
LISTNAMES=$(repodirs_to_specs $LISTNAMES)
if [ -n "$PREPARETASK" ] ; then if [ -n "$PREPARETASK" ] ; then
if [ -z "$TASKNUMBER" ] ; then if [ -z "$TASKNUMBER" ] ; then
showcmd $ETERBUILDBIN/gita $GIRARHOST get last task showcmd $ETERBUILDBIN/gita $GIRARHOST get last task
...@@ -394,7 +394,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -394,7 +394,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
fi fi
if [ -n "$TASKNUMBER" ] ; then if [ -n "$TASKNUMBER" ] ; then
docmd $ETERBUILDBIN/gita $GIRARHOST show "$TASKNUMBER@" docmd $ETERBUILDBIN/gita $GIRARHOST show "$TASKNUMBER"
fi fi
exit $res exit $res
......
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