Commit 064ed423 authored by Vitaly Lipatov's avatar Vitaly Lipatov

cleanup code, remove obsoleted mailing code

parent 84626097
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. $ETERBUILDDIR/functions/hasher load_mod hasher
############################# #############################
Usage="Usage: $name [-m -s -u -i -c] src.rpm..." Usage="Usage: $name [-m -s -u -i -c] src.rpm..."
...@@ -22,7 +22,6 @@ phelp() ...@@ -22,7 +22,6 @@ phelp()
echog "$Descr" echog "$Descr"
echog "$Usage" echog "$Usage"
echog "Options:" echog "Options:"
# echog " -m - mail result log"
echog " -s - sign package(s)" echog " -s - sign package(s)"
echog " -u - sign and upload package(s) to Incoming" echog " -u - sign and upload package(s) to Incoming"
echog " -i - install built packages in test hasher" echog " -i - install built packages in test hasher"
...@@ -32,7 +31,6 @@ phelp() ...@@ -32,7 +31,6 @@ phelp()
while getopts :hmic opt; do while getopts :hmic opt; do
case $opt in case $opt in
h) phelp; exit 0;; h) phelp; exit 0;;
# m) fatal "Mail is disabled for this version" ; TOMAIL=1 ;;
i) TESTINSTALL=1;; i) TESTINSTALL=1;;
c) HASHERARG="--without-stuff $HASHERARG";; c) HASHERARG="--without-stuff $HASHERARG";;
+?) echog "$name: options should not be preceded by a '+'." 1>&2; exit 2;; +?) echog "$name: options should not be preceded by a '+'." 1>&2; exit 2;;
...@@ -53,22 +51,6 @@ LISTRPMARGS=$@ ...@@ -53,22 +51,6 @@ LISTRPMARGS=$@
parse_cmd_pre "$@" parse_cmd_pre "$@"
mygetopts $LISTARGS mygetopts $LISTARGS
# Start as mail helper
function mail_build()
{
MUTT=mutt
which $MUTT &>/dev/null || return
$0 "$@" 2>&1 | $MUTT "$OWNERMAIL" -s "Result of rebuild at $HOSTNAME at `date`"
}
if [ -n "$TOMAIL" ]; then
echog "Build via email"
( mail_build $LISTNAMES $LISTARGS ) >/dev/null 2>&1 &
echog "Build request is accepted for: $LISTNAMES"
echog "Report will be sending to: $OWNERMAIL"
exit 0
fi
RESULT=0 RESULT=0
HASHERDIR=$HASHERDIR$MENVARG HASHERDIR=$HASHERDIR$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