fix some mistakes

bin/myhsh

@@ -137,21 +137,13 @@ print_list $LISTBUILTSH
 
 echo
 
-# build binary package list
-function get_binpkg_list()
-{
-PKGDIR=$HASHERDIR/repo/i586/RPMS.hasher
-
-find "$PKGDIR" ! -name '*\.src\.rpm' -name '*\.rpm' -execdir \
-	rpmquery -p --qf='%{sourcerpm}\t%{name}-%{version}-%{release}.%{arch}.rpm\n' "{}" \; \
-	| grep "^$1[[:space:]].*" | cut -f2 | xargs -n1 -I "{}" echo "$PKGDIR/{} "
-}
 
 if [ "$RESULT" = "0" -a -n "$TESTINSTALL" ] ; then
 	# test install (only for last package in list)
 	# some key for build hasher from scratch
 	echog "Find binary packages for $LASTPACKAGE ..."
 	BINPACKAGES=`get_binpkg_list $HASHERDIR/repo/$DEFAULTARCH/RPMS.hasher $LASTPACKAGE`
+	test -n "$BINPACKAGES" || fatal "Can't find binary packages for $LASTPACKAGE in `ls -l $HASHERDIR/repo/$DEFAULTARCH/RPMS.hasher`"
 	echo "List: $BINPACKAGES"
 	echo
 	loginhsh -t -i $MENVARG $BINPACKAGES || exit 1

bin/rpmgs

@@ -14,6 +14,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
+. $ETERBUILDDIR/functions/rpm
 
 WEXT=""
 GETSOURCE=""

share/eterbuild/functions/common

@@ -75,7 +75,7 @@ TARGET=`distr_vendor -p`
 VENDOR=`distr_vendor -s`
 
 if [ "$VENDOR" = "alt" ] && [ -n "$MENV" ] ; then
-	APTCONF=$APTCONF.$MENV
+	APTCONF=${APTCONF/.SS}.$MENV
 	
 	echog "Target ALT Linux system: `get_distr_version $MENV`, use \$APTCONF"
 	MENVARG="-$MENV"

tests/test_get_bin.sh

+#!/bin/sh
+
+. `dirname $0`/../share/eterbuild/functions/common
+. $ETERBUILDDIR/functions/rpm
+
+HASHERDIR=$HASHERDIR-SS
+get_binpkg_list $HASHERDIR/repo/$DEFAULTARCH/RPMS.hasher asymptote-1.43-alt1.src.rpm