Commit d4f9848d authored by Vitaly Lipatov's avatar Vitaly Lipatov

clean BINARYREPO by default

parent abaa549f
......@@ -244,7 +244,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
if [ -n "$PREPARETASK" ] ; then
docmd ssh $GIRARHOST task add $TASKNUMBER repo $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
else
docmd ssh $GIRARHOST build -b $BINARYREPO $(usearg -p $POCKET) $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
docmd ssh $GIRARHOST build $(usearg -b $BINARYREPO) $(usearg -p $POCKET) $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
fi
# FIXME: incorporate
cat $RPMDIR/uploaded.log.tmp | grep task | head -n2 | tail -n1 >> $RPMDIR/uploaded.log
......@@ -337,7 +337,7 @@ if [ -n "$PREPARETASK" ] ; then
docmd ssh $GIRARHOST task add $TASKNUMBER $TASKLIST 2>&1 | tee $RPMDIR/uploaded.log.tmp
else
echo "Create task for $TASKLIST"
docmd ssh $GIRARHOST build -b $BINARYREPO $TASKLIST 2>&1 | tee $RPMDIR/uploaded.log.tmp
docmd ssh $GIRARHOST build $(usearg -b $BINARYREPO) $TASKLIST 2>&1 | tee $RPMDIR/uploaded.log.tmp
fi
# FIXME: parse and incorporate
......
......@@ -65,7 +65,7 @@ get_type_by_current_branch()
# set BYNARYREPO var by MENV in arg (M50 or 5.0)
set_binaryrepo()
{
BINARYREPO="sisyphus"
BINARYREPO=""
if [ -n "$BINARYREPONAME" ] ; then
BINARYREPO="$BINARYREPONAME"
MENV="$(get_altdistr_mod $BINARYREPO)"
......@@ -75,7 +75,11 @@ set_binaryrepo()
return
fi
test -z "$1" && return
BINARYREPO="`get_altdistr_version $1`"
[ "$BINARYREPO" = "sisyphus" ] && BINARYREPO=""
return 0
}
# M50 -> 5.0, M60P -> p6
......
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