Commit 116a1e67 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbs: fix build on various repos

parent f926ec34
...@@ -161,6 +161,8 @@ fi ...@@ -161,6 +161,8 @@ fi
# set SPECDIR from LISTNAMES if empty # set SPECDIR from LISTNAMES if empty
[ -n "$SPECDIR" ] || set_specdir $LISTNAMES [ -n "$SPECDIR" ] || set_specdir $LISTNAMES
set_binaryrepo $MENV
# 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
echo "Run with gear repo..." echo "Run with gear repo..."
...@@ -172,11 +174,9 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -172,11 +174,9 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
if [ -n "$TASKNUMBER" ] ; then if [ -n "$TASKNUMBER" ] ; then
ssh $GIRARHOST task add $TASKNUMBER repo $BASENAME $TAG ssh $GIRARHOST task add $TASKNUMBER repo $BASENAME $TAG
else else
ssh $GIRARHOST task new ssh $GIRARHOST build -b $BINARYREPO $BASENAME $TAG
ssh $GIRARHOST task add repo $BASENAME $TAG || ssh $GIRARHOST task rm
ssh $GIRARHOST task run
fi fi
echo "run task $BASENAME with tag $TAG at $GIRARHOST ($MENV) at `date "+%c"`" >>$RPMDIR/uploaded.log echo "run task $BASENAME with tag $TAG at $GIRARHOST (in $BINARYREPO) at `date "+%c"`" >>$RPMDIR/uploaded.log
exit exit
fi fi
...@@ -199,10 +199,6 @@ if [ -n "$REMOTEBUILD" ] ; then ...@@ -199,10 +199,6 @@ if [ -n "$REMOTEBUILD" ] ; then
exit 0 exit 0
fi fi
#set_incoming $MENV
set_binaryrepo $MENV
if [ -n "${DELETENOW}" ]; then if [ -n "${DELETENOW}" ]; then
echog "Removing did not realized yet" echog "Removing did not realized yet"
exit 1 exit 1
......
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