always set APTCONF and HASHERDIR

share/eterbuild/functions/common

@@ -125,12 +125,13 @@ VENDOR=`distr_vendor -s`
 RPMVENDOR=`distr_vendor -n`
 
 if [ "$VENDOR" = "alt" ] && [ -n "$MENV" ] ; then
-	[ -n "$APTCONF" ] || APTCONF=${APTCONFBASE/.SS}.$MENV
+	#[ -n "$APTCONF" ] && fatal "Internal error: APTCONF already defined as $APTCONF for $MENV"
+	APTCONF=${APTCONFBASE/.SS}.$MENV
 	
 	[ -n "$VERBOSE" ] && echog "Target ALT Linux system: `get_altdistr_version $MENV`, use \$APTCONF"
 	MENVARG="-$MENV"
 else
-	# FIXME: echog breakes vars
+	# FIXME: echog breaks vars
 	echog "Distribution: \$DISTRNAME (\$VENDOR) (target package: \$TARGET)"
 fi
 }

share/eterbuild/functions/config

@@ -40,8 +40,6 @@ COMPANYFTP=etersoft.ru
 TARGETFTPBASE="/var/ftp"
 LOGDIR="$RPMDIR/log"
 HASHERBASEDIR="$HOME/hasher"
-# fill it in set_hasher_dir
-HASHERDIR=""
 HASHER_NOCHECK=nvr,gpg,packager,buildtime
 HASHERARG=""
 

share/eterbuild/functions/hasher

@@ -12,9 +12,9 @@ set_hasherdir()
 		fatal "Please install hasher package before use it"
 	fi
 
-	if [ -n "$HASHERDIR" ] ; then
-		fatal "Possible HASHERBASEDIR is not set correctly. Please replace HASHERDIR with HASHERBASEDIR in the config file"
-	fi
+	#if [ -n "$HASHERDIR" ] ; then
+	#	fatal "Possible HASHERBASEDIR is not set correctly. Please replace HASHERDIR with HASHERBASEDIR in the config file"
+	#fi
 	HASHERDIR=$HASHERBASEDIR$MENVARG
 	if [ "$DEFAULTARCH" = "x86_64" ] ; then
 		HASHERDIR="$HASHERDIR-64"