Commit 11b6e225 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbph: cleanup, no use too more tabs

parent 26a132a2
...@@ -313,11 +313,11 @@ fi ...@@ -313,11 +313,11 @@ fi
[ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs --rmsource --rmspec" [ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs --rmsource --rmspec"
[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbsh $GIRARHOST" [ -z "$BUILDCOMMAND" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbsh $GIRARHOST"
if [ "$VENDOR" = "alt" ] ; then # set SPECDIR from LISTNAMES if empty
# run inside gear repo, just create backported spec [ -n "$SPECDIR" ] || set_specdir $LISTNAMES
# set SPECDIR from LISTNAMES if empty
[ -n "$SPECDIR" ] || set_specdir $LISTNAMES # if run for ALT inside gear repo, just create backported spec
if is_gear $SPECDIR ; then if [ "$VENDOR" = "alt" ] && is_gear $SPECDIR ; then
[ -f "$LISTNAMES" ] || fatal "Run with one spec inside gear repo" [ -f "$LISTNAMES" ] || fatal "Run with one spec inside gear repo"
USEBRANCH=$MDISTR USEBRANCH=$MDISTR
SPEC=$LISTNAMES SPEC=$LISTNAMES
...@@ -368,11 +368,10 @@ if [ "$VENDOR" = "alt" ] ; then ...@@ -368,11 +368,10 @@ if [ "$VENDOR" = "alt" ] ; 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"
fi fi
[ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs" [ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs $GIRARHOST"
$BUILDCOMMAND $LISTRPMARGS $REMOTEBUILD $DISTRARG $SPEC || { git checkout $CURBRANCH ; fatal "Can't build" ; } $BUILDCOMMAND $LISTRPMARGS $REMOTEBUILD $DISTRARG $SPEC || { git checkout $CURBRANCH ; fatal "Can't build" ; }
git checkout $CURBRANCH git checkout $CURBRANCH
exit $? exit $?
fi
fi fi
unset MENV MENVARG unset MENV MENVARG
......
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