You need to sign in or sign up before continuing.
Commit dea094c7 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbph, rpmbs, rpmbsh: support bypass -e

parent 5707d7ef
...@@ -15,7 +15,7 @@ load_mod repl rpm git buildsrpm spec branch ...@@ -15,7 +15,7 @@ load_mod repl rpm git buildsrpm spec branch
############################# #############################
# FIXME: CURRENTBRANCHNAME?? # FIXME: CURRENTBRANCHNAME??
Usage="Usage: $name [-r -u -U -n -i -m -v -q] [-b REPONAME] spec..." Usage="Usage: $name [-r -u -U -n -i -m -v -q -e] [-b REPONAME] spec..."
function mygetopts() function mygetopts()
{ {
name=${0##*/} name=${0##*/}
...@@ -36,6 +36,7 @@ phelp() ...@@ -36,6 +36,7 @@ phelp()
echog "Ext. options:" echog "Ext. options:"
echog " -v more verbose" echog " -v more verbose"
echog " -q quiet" echog " -q quiet"
echog " -e sign and run gear test only task girar build"
echog " -z create src.rpm with compatible gzip compression (obsoleted)" echog " -z create src.rpm with compatible gzip compression (obsoleted)"
echo echo
echog "Examples:" echog "Examples:"
...@@ -46,11 +47,11 @@ phelp() ...@@ -46,11 +47,11 @@ phelp()
FORCE= FORCE=
PASSEDARGS= PASSEDARGS=
while getopts :hnuaAfvqb: opt; do while getopts :hnuaeAfvqb: opt; do
case $opt in case $opt in
h) phelp; exit 0 ;; h) phelp; exit 0 ;;
n) NOBUILD=1 ;; n) NOBUILD=1 ;;
u|a|A) PASSEDARGS="$PASSEDARGS -$opt" ;; u|e|a|A) PASSEDARGS="$PASSEDARGS -$opt" ;;
f) FORCE=1 ; PASSEDARGS="$PASSEDARGS -$opt" ;; f) FORCE=1 ; PASSEDARGS="$PASSEDARGS -$opt" ;;
v) VERBOSE=1 ;; v) VERBOSE=1 ;;
b) BINARYREPONAME=$OPTARG ;; b) BINARYREPONAME=$OPTARG ;;
......
...@@ -58,7 +58,7 @@ phelp() ...@@ -58,7 +58,7 @@ phelp()
#echog " -k [TARGET] - generate src.rpm and publish to TARGET dir (from Source: by default)" #echog " -k [TARGET] - generate src.rpm and publish to TARGET dir (from Source: by default)"
#echog " -r [RELEASE] - publish to RELEASE target dir version" #echog " -r [RELEASE] - publish to RELEASE target dir version"
echog "Ext. options:" echog "Ext. options:"
echog " -e sigan and run gear test only task girar build" echog " -e sign and run gear test only task girar build"
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 dir ETERDESTSRPM if defined)" echog " -s sign package(s) (and move it to dir ETERDESTSRPM if defined)"
......
...@@ -16,7 +16,7 @@ REMCOM= ...@@ -16,7 +16,7 @@ REMCOM=
COMMIT= COMMIT=
############################# #############################
Usage="Usage: $name [-r -s -u -m -i -c] [-f] [spec or src.rpm]..." Usage="Usage: $name [-r -s -u -m -i -c -e] [-f] [spec or src.rpm]..."
function mygetopts() function mygetopts()
{ {
name=${0##*/} name=${0##*/}
...@@ -35,6 +35,7 @@ phelp() ...@@ -35,6 +35,7 @@ phelp()
echog "Ext. options:" echog "Ext. options:"
echog " -c build without stuff (without previous built packages)" echog " -c build without stuff (without previous built packages)"
echog " -s sign (and move to dir ETERDESTSRPM if defined) after build" echog " -s sign (and move to dir ETERDESTSRPM if defined) after build"
echog " -e sign and run gear test only task girar build"
echog " -t make temporary commit before build (rpmbb like behavior)" echog " -t make temporary commit before build (rpmbb like behavior)"
echog " -l lazy cleanup (clean before build, not after)" echog " -l lazy cleanup (clean before build, not after)"
echog " -w build with gear --hasher myhsh directly" echog " -w build with gear --hasher myhsh directly"
...@@ -42,11 +43,11 @@ phelp() ...@@ -42,11 +43,11 @@ phelp()
} }
PASSEDARGS= PASSEDARGS=
while getopts :hiufclstwb: opt; do while getopts :hieufclstwb: opt; do
case $opt in case $opt in
h) phelp; exit 0;; h) phelp; exit 0;;
t) COMMIT="--commit" ;; t) COMMIT="--commit" ;;
u|f|c|s|l) PASSEDARGS="$PASSEDARGS -$opt" ;; u|f|c|e|s|l) PASSEDARGS="$PASSEDARGS -$opt" ;;
w) THOROUGH=1 ;; w) THOROUGH=1 ;;
i) INSTALLPKG=1 ;; i) INSTALLPKG=1 ;;
b) BINARYREPONAME=$OPTARG ;; b) BINARYREPONAME=$OPTARG ;;
...@@ -91,7 +92,7 @@ if [ -n "$THOROUGH" ] ; then ...@@ -91,7 +92,7 @@ if [ -n "$THOROUGH" ] ; then
else else
# We do not not pass args for myhsh here... # We do not not pass args for myhsh here...
# FIXME: не обрабатывает два пропускаемых вместе параметра # FIXME: не обрабатывает два пропускаемых вместе параметра
pack_src_rpm $COMMIT $(drop_args "$LISTRPMARGS" s u c l f a A) pack_src_rpm $COMMIT $(drop_args "$LISTRPMARGS" s u c e l f a A)
# build in hasher # build in hasher
docmd time $ETERBUILDBIN/myhsh $MENVARG $(drop_args "$LISTRPMARGS" f u a A) $LISTBUILT docmd time $ETERBUILDBIN/myhsh $MENVARG $(drop_args "$LISTRPMARGS" f u a A) $LISTBUILT
......
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