Skip to content

E
etersoft-build-utils
Commit bd5105f3 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

do fatal error if HASHERBASEDIR is not set, remove buggy workaround

parent b03954d5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
share/eterbuild/functions/config
View file @ bd5105f3
...@@ -40,6 +40,8 @@ COMPANYFTP=etersoft.ru ...@@ -40,6 +40,8 @@ COMPANYFTP=etersoft.ru
TARGETFTPBASE="/var/ftp" TARGETFTPBASE="/var/ftp"
LOGDIR="$RPMDIR/log" LOGDIR="$RPMDIR/log"
HASHERBASEDIR="$HOME/hasher" HASHERBASEDIR="$HOME/hasher"
# fill it in set_hasher_dir
HASHERDIR=""
HASHER_NOCHECK=nvr,gpg,packager,buildtime HASHER_NOCHECK=nvr,gpg,packager,buildtime
HASHERARG="" HASHERARG=""
......
share/eterbuild/functions/hasher
View file @ bd5105f3
...@@ -13,8 +13,7 @@ set_hasherdir() ...@@ -13,8 +13,7 @@ set_hasherdir()
fi fi
if [ -n "$HASHERDIR" ] ; then if [ -n "$HASHERDIR" ] ; then
warning "Possible HASHERBASEDIR is not set correctly. Please replace HASHERDIR with HASHERBASEDIR in the config file" fatal "Possible HASHERBASEDIR is not set correctly. Please replace HASHERDIR with HASHERBASEDIR in the config file"
HASHERBASEDIR=$HASHERDIR
fi fi
HASHERDIR=$HASHERBASEDIR$MENVARG HASHERDIR=$HASHERBASEDIR$MENVARG
if [ "$DEFAULTARCH" = "x86_64" ] ; then if [ "$DEFAULTARCH" = "x86_64" ] ; then
......
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