Commit 4b17d8e6 authored by Vitaly Lipatov's avatar Vitaly Lipatov

add comments, fix messages

parent 74342b0f
...@@ -324,7 +324,7 @@ if [ "$VENDOR" = "alt" ] && is_gear $SPECDIR ; then ...@@ -324,7 +324,7 @@ if [ "$VENDOR" = "alt" ] && is_gear $SPECDIR ; then
SPEC=$LISTNAMES SPEC=$LISTNAMES
BPSPEC=$SPEC.$USEBRANCH BPSPEC=$SPEC.$USEBRANCH
# support for without M names # support for without M names like 5.1
USENUMBRANCH=$(get_altdistr_version $USEBRANCH) USENUMBRANCH=$(get_altdistr_version $USEBRANCH)
if [ "$USENUMBRANCH" != "$USEBRANCH" ] ; then if [ "$USENUMBRANCH" != "$USEBRANCH" ] ; then
if is_exist_branch $USENUMBRANCH ; then if is_exist_branch $USENUMBRANCH ; then
...@@ -359,7 +359,7 @@ if [ "$VENDOR" = "alt" ] && is_gear $SPECDIR ; then ...@@ -359,7 +359,7 @@ if [ "$VENDOR" = "alt" ] && is_gear $SPECDIR ; then
git merge $CURBRANCH git merge $CURBRANCH
mv -f $BPSPEC $SPEC mv -f $BPSPEC $SPEC
# FIXME: Ctrl-\ and q will cancelled less with return error code # FIXME: Ctrl-\ and q will cancelled less with return error code
if ! ( echo "# etersoft-build-utils NOTE: You can press Ctrl-\ before quit for cancel process."; echo ; git diff $USEBRANCH ) | less; then if ! ( echo "etersoft-build-utils INFO: Please check diff for backported spec:" ; echo "# etersoft-build-utils NOTE: You can press Ctrl-\ before quit for cancel process."; echo ; git diff $USEBRANCH ) | less; then
#git checkout $SPEC $MDISTR #git checkout $SPEC $MDISTR
#git checkout $CURBRANCH #git checkout $CURBRANCH
fatal "User cancelled. You are still in $USEBRANCH branch with modified spec" fatal "User cancelled. You are still in $USEBRANCH branch with modified spec"
......
...@@ -47,7 +47,7 @@ phelp() ...@@ -47,7 +47,7 @@ phelp()
echog "Ext. options:" echog "Ext. options:"
echog " -c - only sign package(s) with checking" echog " -c - only sign package(s) with checking"
echog " -f - force operation (overwrite tag)" echog " -f - force operation (overwrite tag)"
echog " -s - sign package(s) and move it to upload dir (ETERDESTSRPM)" echog " -s - sign package(s) and copy it to upload dir (ETERDESTSRPM)"
echog " -n - do not check with sisyphus_check before upload" echog " -n - do not check with sisyphus_check before upload"
echog " -o - create nosrc.rpm package" echog " -o - create nosrc.rpm package"
echog " -z - create src.rpm with compatible gzip compression" echog " -z - create src.rpm with compatible gzip compression"
......
...@@ -95,6 +95,7 @@ if [ -n "$REMOTEBUILD" ] ; then ...@@ -95,6 +95,7 @@ if [ -n "$REMOTEBUILD" ] ; then
echog "==== Copying to build server =====" echog "==== Copying to build server ====="
rsync -vay --partial --progress --checksum \ 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"
# TODO: remove after build
ssh -t $BUILDSERVER "cd $REMOTERPMDIR/SRPMS && time myhsh $MENVARG $LISTRPMARGS $LISTSRPM" ssh -t $BUILDSERVER "cd $REMOTERPMDIR/SRPMS && time myhsh $MENVARG $LISTRPMARGS $LISTSRPM"
RESULT=$? RESULT=$?
date date
......
...@@ -121,7 +121,6 @@ drop_args() ...@@ -121,7 +121,6 @@ drop_args()
# Internal # Internal
# Определяет, для какой среды собирать: по ключу -M23 -M24 или по каталогу, в котором спек
detect_target_env() detect_target_env()
{ {
local DISTRNAME=`distr_vendor -e` local DISTRNAME=`distr_vendor -e`
...@@ -210,7 +209,7 @@ make_temp_file() ...@@ -210,7 +209,7 @@ make_temp_file()
fi fi
} }
# check if path is server:/path
is_ssh_target() is_ssh_target()
{ {
echo "$1" | grep -q ":" echo "$1" | grep -q ":"
......
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