Commit ec151e59 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbph: improve messages

parent 45f5dfaf
...@@ -389,7 +389,7 @@ test -z "$LISTNAMES" && fatal "file not found in '$@'" ...@@ -389,7 +389,7 @@ test -z "$LISTNAMES" && fatal "file not found in '$@'"
if [ "$PKGVENDOR" = "alt" ] ; then if [ "$PKGVENDOR" = "alt" ] ; then
MDISTR=$MENV MDISTR=$MENV
[ -n "$BINARYREPONAME" ] && MDISTR=$(get_altdistr_mod $BINARYREPONAME) [ -n "$BINARYREPONAME" ] && MDISTR=$(get_altdistr_mod $BINARYREPONAME)
[ "$MDISTR" = "SS" ] && fatal "It is senseless to backport to Sisyphus (You can try with -b $EXAMPLEALTDISTRVERSION)." [ "$MDISTR" = "SS" ] && fatal "It makes no sense to backport to Sisyphus (You need to try with -b $EXAMPLEALTDISTRVERSION)."
# override by defined target version # override by defined target version
DISTRVERSION=$(get_altdistr_version $MDISTR) DISTRVERSION=$(get_altdistr_version $MDISTR)
else else
...@@ -433,11 +433,11 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then ...@@ -433,11 +433,11 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then
CURBRANCH=$(get_current_branch) CURBRANCH=$(get_current_branch)
if [ "$CURBRANCH" = "$USEBRANCH" ] ; then if [ "$CURBRANCH" = "$USEBRANCH" ] ; then
fatal "Run rpmbph in sisyphus or master branch, not in backport branch $USEBRANCH" fatal "Run rpmbph in sisyphus or master branch only, not in backport branch $USEBRANCH"
fi fi
if [ "$CURBRANCH" = "$OLDBRANCH" ] ; then if [ "$CURBRANCH" = "$OLDBRANCH" ] ; then
fatal "Run rpmbph in sisyphus or master branch, not in backport branch $OLDBRANCH" fatal "Run rpmbph in sisyphus or master branch only, not in backport branch $OLDBRANCH"
fi fi
# Create branch if not exist yet # Create branch if not exist yet
...@@ -456,12 +456,12 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then ...@@ -456,12 +456,12 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then
if [ -z "$QUIET" ] && tty -s && ! ( 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 if [ -z "$QUIET" ] && tty -s && ! ( 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."
fi fi
docmd git add $SPEC docmd git add $SPEC
if ! git_commit_ignore_nothing -a -m "backported to $USEBRANCH as $(get_version $SPEC)-$(get_release $SPEC) (with rpmbph script)" ; then if ! git_commit_ignore_nothing -a -m "backported to $USEBRANCH as $(get_version $SPEC)-$(get_release $SPEC) (with rpmbph script)" ; then
#git checkout $CURBRANCH #git checkout $CURBRANCH
fatal "Commit error. You are still in $MDISTR branch with modified and uncommitted spec" fatal "Commit error. You are still in $MDISTR branch with modified and uncommitted spec file"
fi fi
[ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs $GIRARHOST" [ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs $GIRARHOST"
docmd $BUILDCOMMAND $LISTRPMARGS $UPLOADARG $DISTRARG $SPEC || { git checkout $CURBRANCH ; fatal "Can't build" ; } docmd $BUILDCOMMAND $LISTRPMARGS $UPLOADARG $DISTRARG $SPEC || { git checkout $CURBRANCH ; fatal "Can't build" ; }
......
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