# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1219048853 0
# Node ID ab6c73d0068033f23ec528219743c7cd668d03ab
# Parent  005c98b53d428a677a4f068cc37e4f7f24bdc21e
tazpkg: fix a loop in install list

diff -r 005c98b53d42 -r ab6c73d00680 lib/tazpkgbox/package_infos
--- a/lib/tazpkgbox/package_infos	Tue Aug 12 07:21:53 2008 +0000
+++ b/lib/tazpkgbox/package_infos	Mon Aug 18 08:40:53 2008 +0000
@@ -125,7 +125,7 @@
 			tazpkg reconfigure $PACKAGE; sleep 2\"</action>
 			<action type=\"closewindow\">INSTALLED_PACKAGE_ACTIONS</action>
 		</button>"
-if grep -q ^$PKG$ /var/lib/tazpkg/blocked-packages.list; then
+if grep -qs ^$PKG$ /var/lib/tazpkg/blocked-packages.list; then
 	PACKAGE_INFOS="$PACKAGE_INFOS
 		<button>
 			<label>Unblock</label>
diff -r 005c98b53d42 -r ab6c73d00680 tazpkg
--- a/tazpkg	Tue Aug 12 07:21:53 2008 +0000
+++ b/tazpkg	Mon Aug 18 08:40:53 2008 +0000
@@ -445,21 +445,25 @@
 				[ -n "$list" ] || list="$TOP_DIR/packages.list"
 				# We can install packages from a local dir by greping
 				# the TAZPKG_BASENAME in the local packages.list.
+				found=0
 				if [ -f "$list" ]; then
 					echo "Checking if $pkg exist in local list... "
 					mkdir $TMP_DIR
 					for i in $pkg-*.tazpkg; do
 						[ -f $i ] || continue
 						( cd $TMP_DIR ; cpio -i receipt > /dev/null) < $i
+						[ "$(. $TMP_DIR/receipt; echo $PACKAGE)" = "$pkg" ] || continue
 						if grep -q ^$(package_fullname_in_dir $TMP_DIR).tazpkg$ $list
 						then
+							found=1
 							tazpkg install $i $root --list=$list
 							break
 						fi
 					done
 					rm -rf $TMP_DIR
+				fi
 				# Install deps from the mirror.
-				else
+				if [ $found -eq 0 ]; then
 					if [ ! -f "$LOCALSTATE/packages.list" ]; then
 						tazpkg recharge
 					fi
@@ -1567,7 +1571,7 @@
 					pkg=${f%/files.list}
 					echo -n "  $pkg"
 					if [ -f $pkg/modifiers ]; then
-						echo -n " (known as overridden by $(cat $pkg/modifiers))"
+						echo -n " (overridden by $(echo "$(cat $pkg/modifiers)"))"
 					fi
 					echo ""
 				done