Commit 52bc0008 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix GIRARHOST for subcommand

parent ca8a615f
......@@ -29,7 +29,7 @@ FIXPATCHFUZZ="%define _default_patch_fuzz 3"
# Set buildreq
if [ "$VENDOR" = "alt" ] ; then
BUILDREQ="BuildRequires: rpm-build-compat >= 0.95"
[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND=$ETERBUILDBIN/rpmbsh
[ -z "$BUILDCOMMAND" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbsh $GIRARHOST"
# Change release according to alt policy with extensions
# General rule: alwars alt(N-1).MM.(N)
set_release $SPECNAME $(get_txtrelease $SPECNAME)$(decrement_release $BASERELEASE).$MDISTR.$BASERELEASE
......@@ -288,6 +288,11 @@ fi
LISTRPMARGS=$@
}
if is_girar_name $1 ; then
GIRARHOST=$1
shift
fi
parse_cmd_pre "$@"
mygetopts $LISTARGS
......
......@@ -168,7 +168,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
build_rpms_name "$LISTNAMES"
pkg_release_check
check_gear_and_tag
$ETERBUILDBIN/gpush $BASENAME || fatal "Git push via gpush failed. Possibly you need to run ginit for create remote repo."
$ETERBUILDBIN/gpush $GIRARHOST $BASENAME || fatal "Git push via gpush failed. Possibly you need to run ginit for create remote repo."
TAG=$VERSION-$RELEASE
if [ -n "$TASKNUMBER" ] ; then
ssh $GIRARHOST task add $TASKNUMBER repo $BASENAME $TAG
......
......@@ -110,9 +110,9 @@ cd -
# make src.rpm if build OK and we have options for rpmbs
if [ "$RESULT" = "0" ] && [ -n "$LISTRPMARGS" ]; then
if is_gear $SPECDIR ; then
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTNAMES
$ETERBUILDBIN/rpmbs $GIRARHOST $MENVARG $LISTRPMARGS $LISTNAMES
else
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTBUILT
$ETERBUILDBIN/rpmbs $GIRARHOST $MENVARG $LISTRPMARGS $LISTBUILT
fi
fi
......
......@@ -47,4 +47,4 @@ if is_gear `pwd` ; then
fi
$ETERBUILDBIN/rpmbsh $REMOTE -i $SPEC || fatal "Error with build in hasher"
$ETERBUILDBIN/rpmbs -u $SPEC || fatal "Error with upload"
$ETERBUILDBIN/rpmbs $GIRARHOST -u $SPEC || fatal "Error with upload"
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