Commit 0ddc2737 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbsh: disable cd to SRPMS dir (will need fix?)

parent 80e36bae
...@@ -70,6 +70,7 @@ fi ...@@ -70,6 +70,7 @@ fi
parse_cmd_pre "$@" parse_cmd_pre "$@"
mygetopts $LISTARGS mygetopts $LISTARGS
# TODO: skip for prev. packed src.rpm
# If fail, we already has correct changelog # If fail, we already has correct changelog
add_changelog_helper "- new version" $LISTNAMES add_changelog_helper "- new version" $LISTNAMES
...@@ -78,6 +79,7 @@ add_changelog_helper "- new version" $LISTNAMES ...@@ -78,6 +79,7 @@ add_changelog_helper "- new version" $LISTNAMES
# FIXME: # FIXME:
pack_src_rpm $COMMIT $(echo $LISTRPMARGS | sed -e "s|-[suUic]||g") pack_src_rpm $COMMIT $(echo $LISTRPMARGS | sed -e "s|-[suUic]||g")
# TODO: skip for prev. packed src.rpm
set_specdir $LISTNAMES set_specdir $LISTNAMES
if [ -n "$REMOTEBUILD" ] ; then if [ -n "$REMOTEBUILD" ] ; then
...@@ -88,8 +90,9 @@ if [ -n "$REMOTEBUILD" ] ; then ...@@ -88,8 +90,9 @@ if [ -n "$REMOTEBUILD" ] ; then
echog "############ Build at build server '$BUILDSERVER' (with $LISTRPMARGS options) ############" echog "############ Build at build server '$BUILDSERVER' (with $LISTRPMARGS options) ############"
echo echo
echog "==== Copying to build server =====" echog "==== Copying to build server ====="
#echog "It is recommended to rename old version at server for save traffic during rsync" # FIXME: do not change dir? Why LISTBUILT is not full path?
cd $RPMTOPDIR/SRPMS && rsync -vay --partial --progress --checksum \ #cd $RPMTOPDIR/SRPMS
rsync -vay --partial --progress --checksum \
-e ssh $LISTBUILT $BUILDSERVER:$REMOTERPMDIR/SRPMS/ || fatal "Error with rsync" -e ssh $LISTBUILT $BUILDSERVER:$REMOTERPMDIR/SRPMS/ || fatal "Error with rsync"
ssh -t $BUILDSERVER "cd $REMOTERPMDIR/SRPMS && time myhsh $MENVARG $LISTRPMARGS $LISTBUILT" ssh -t $BUILDSERVER "cd $REMOTERPMDIR/SRPMS && time myhsh $MENVARG $LISTRPMARGS $LISTBUILT"
RESULT=$? RESULT=$?
...@@ -99,13 +102,12 @@ if [ -n "$REMOTEBUILD" ] ; then ...@@ -99,13 +102,12 @@ if [ -n "$REMOTEBUILD" ] ; then
else else
cd $RPMTOPDIR/SRPMS && time $ETERBUILDBIN/myhsh $MENVARG $LISTRPMARGS $LISTBUILT cd $RPMTOPDIR/SRPMS && time $ETERBUILDBIN/myhsh $MENVARG $LISTRPMARGS $LISTBUILT
RESULT=$? RESULT=$?
cd -
date date
echo "-------------------------------" echo "-------------------------------"
fi fi
cd -
# make src.rpm if build OK and we have options for rpmbs # make src.rpm if build OK and we have options for rpmbs
if [ "$RESULT" = "0" ] && [ -n "$LISTRPMARGS" ]; then if [ "$RESULT" = "0" ] && [ -n "$LISTRPMARGS" ]; then
......
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