# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1543237143 -7200
# Node ID f40de1e052aa6b976b4d22c8a16d30dfefa5d16f
# Parent  ed2904dae9f299319a66bd537ccf38b908dbc638
modules/get: continue fixing cookmode

diff -r ed2904dae9f2 -r f40de1e052aa modules/get
--- a/modules/get	Mon Nov 26 12:33:58 2018 +0200
+++ b/modules/get	Mon Nov 26 14:59:03 2018 +0200
@@ -347,7 +347,7 @@
 	# output: full path to the downloaded package
 
 	debug "\nget_pkg('$1', '$2')"
-	local repo line namever pkgsum pkgfile
+	local repo line namever pkgsum pkgfile pi
 
 	IFS=$'\n'
 	for rep in $PRIORITY; do
@@ -359,10 +359,9 @@
 		namever=$(awk -F$'\t' -vpkg="$(virtual_pkg "$1" "$rep")" \
 			'$1==pkg || $1"-"$2==pkg {printf "%s-%s", $1, $2; exit}' "$pi")
 
-		case $SLITAZ_ARCH in
-			i?86) pkgfile="$namever.tazpkg";;
-			*)    pkgfile="$namever-$SLITAZ_ARCH.tazpkg";;
-		esac
+		pkgfile="$namever-$SLITAZ_ARCH.tazpkg"
+		[ -e "$pkgfile" ] ||
+		pkgfile="$namever-any.tazpkg"
 
 		if [ -n "$namever" ]; then
 			pkgsum=$(awk -vfile="$pkgfile" '{if($2==file)print $1}' $rep/packages.md5)
@@ -454,7 +453,11 @@
 		if (index(" " $10 " ", " " pkg " ")) { printf("%s-%s", $1, $2); exit; }
 	}' $pi)"
 
-	[ -n "$namever" ] && pkgfile=$(find "$PKGS" -name "$namever*.tazpkg")
+	if [ -n "$namever" ]; then
+		pkgfile=$(find "$PKGS" -name "$namever-$SLITAZ_ARCH.tazpkg")
+		[ -n "$pkgfile" ] ||
+		pkgfile=$(find "$PKGS" -name "$namever-any.tazpkg")
+	fi
 
 	if [ -n "$pkgfile" -a -f "$pkgfile" ]; then
 		echo "$pkgfile"