Skip to content

E
etersoft-build-utils
You need to sign in or sign up before continuing.
Commit f8154585 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmbs: don't change branch for upload

parent 17dd653f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
bin/rpmbs
View file @ f8154585
...@@ -300,9 +300,10 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -300,9 +300,10 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
echo "Prepare to publish to $GIRARHOST..." echo "Prepare to publish to $GIRARHOST..."
cd $SPECDIR || fatal cd $SPECDIR || fatal
if set_usebranch ; then # don't touch branch in rpmbs
checkout_usebranch || fatal # if set_usebranch ; then
fi # checkout_usebranch || fatal
# fi
# check release # check release
build_rpms_name "$ln" build_rpms_name "$ln"
...@@ -330,7 +331,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -330,7 +331,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
docmd ssh $GEARHOST build $TESTONLY $(usearg -b $BINARYREPO sisyphus) $(usearg -p $POCKET) $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp docmd ssh $GEARHOST build $TESTONLY $(usearg -b $BINARYREPO sisyphus) $(usearg -p $POCKET) $PROJECTNAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
fi fi
checkout_original_branch # checkout_original_branch
# FIXME: incorporate # FIXME: incorporate
cat $RPMDIR/uploaded.log.tmp | grep task | head -n2 | tail -n1 >> $RPMDIR/uploaded.log cat $RPMDIR/uploaded.log.tmp | grep task | head -n2 | tail -n1 >> $RPMDIR/uploaded.log
......
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