# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1224836874 0
# Node ID a0d51bc28e4e02efe9f3463c67658fbb59f5fe6b
# Parent  581aefe7fad751ccdcfed76ff3ceca7dd20ee0dc
tazpkgbox: add blocked tab

diff -r 581aefe7fad7 -r a0d51bc28e4e lib/tazpkgbox/list
--- a/lib/tazpkgbox/list	Thu Oct 23 09:43:26 2008 +0000
+++ b/lib/tazpkgbox/list	Fri Oct 24 08:27:54 2008 +0000
@@ -25,6 +25,19 @@
 	done
 }
 
+blocked_list()
+{
+	for pkg in /var/lib/tazpkg/installed/*
+	do
+		. $pkg/receipt
+		if grep -qs "^$(basename $pkg)$" /var/lib/tazpkg/blocked-packages.list; then
+			AVAILABLE=$(grep "^$(basename $pkg) " /var/lib/tazpkg/packages.desc | awk '{ print $3 }')
+			
+			echo "$PACKAGE|$VERSION|$AVAILABLE|$SHORT_DESC"
+		fi
+	done
+}
+
 case $1 in
 	installed)
 		CAT=`cat /tmp/tazpkgbox/installed-category`
@@ -43,8 +56,10 @@
 		else
 			grep "$CAT" /var/lib/tazpkg/packages.desc
 		fi ;;
+	blocked)
+		blocked_list;;
 	*)
-		echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|installable|mirrored]" ;;
+		echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|installable|mirrored|blocked]" ;;
 esac
 
 exit 0
diff -r 581aefe7fad7 -r a0d51bc28e4e lib/tazpkgbox/package_infos
--- a/lib/tazpkgbox/package_infos	Thu Oct 23 09:43:26 2008 +0000
+++ b/lib/tazpkgbox/package_infos	Fri Oct 24 08:27:54 2008 +0000
@@ -29,6 +29,9 @@
 				else
 					echo -n "$(stat -c "[configuration: %.16y]" $file)"
 				fi;;
+			#*	if [ "$(tazpkg check-file $file $2)" = "failure" ]; then
+			#		echo -n "Invalid md5"
+			#	fi;;
 			esac
 		fi
 		echo ""
@@ -73,6 +76,11 @@
 			fi
 		done
 		LIST_PKGS="$LIST_PKGS
+	<action>echo "\$PKG" > /tmp/tazpkgbox/pkg</action>
+	<action>/usr/lib/slitaz/tazpkgbox/package_infos</action>
+	<action>refresh:PKG</action>
+	<action>refresh:PKG_STATS</action>
+	<action>refresh:CACHE_STATS</action>
      </tree>
      <hbox>
 	<button ok>
diff -r 581aefe7fad7 -r a0d51bc28e4e tazpkgbox
--- a/tazpkgbox	Thu Oct 23 09:43:26 2008 +0000
+++ b/tazpkgbox	Fri Oct 24 08:27:54 2008 +0000
@@ -111,7 +111,7 @@
 		</pixmap>
 	</hbox>
 
-	<notebook labels="Installed|Installable|Mirrored|Search|Configuration">
+	<notebook labels="Installed|Installable|Mirrored|Blocked|Search|Configuration">
 
 	<vbox>
 		<tree>
@@ -228,6 +228,9 @@
 			<action>refresh:CACHE_STATS</action>
 		</tree>
 		<hbox>
+			<text>
+				<label>"Category:"</label>
+			</text>
 			<combobox>
 				<variable>MIRRORED_CAT</variable>
 				<item>all</item>
@@ -263,6 +266,17 @@
 	</vbox>
 
 	<vbox>
+		<tree>
+			<width>620</width><height>240</height>
+			<variable>BLOCKED</variable>
+			<label>Package name|Version|Available|Description</label>
+			<input>/usr/lib/slitaz/tazpkgbox/list blocked</input>
+			<action>echo "$BLOCKED" > /tmp/tazpkgbox/pkg</action>
+			<action>/usr/lib/slitaz/tazpkgbox/package_infos</action>
+		</tree>
+	</vbox>
+
+	<vbox>
 		<tree icon="tazpkg">
 			<width>620</width><height>120</height>
 			<variable>RESULT_INSTALLED</variable>
@@ -397,7 +411,7 @@
 
 	<hbox>
 		<text wrap="false">
-			<input>installed=`ls /var/lib/tazpkg/installed | wc -l`; mirrored=`cat /var/lib/tazpkg/packages.list | wc -l`; echo "Packages: $installed installed, $(($mirrored - $installed)) installable, $mirrored mirrored, `cat /var/lib/tazpkg/upgradable-packages.list 2> /dev/null | wc -l` to upgrade "</input>
+			<input>installed=`ls /var/lib/tazpkg/installed | wc -l`; mirrored=`cat /var/lib/tazpkg/packages.list | wc -l`; blocked=`cat /var/lib/tazpkg/blocked-packages.list | wc -l`; echo "Packages: $installed installed, $blocked blocked, $(($mirrored - $installed)) installable, $mirrored mirrored, `cat /var/lib/tazpkg/upgradable-packages.list 2> /dev/null | wc -l` to upgrade "</input>
 			<variable>PKG_STATS</variable>
 		</text>
 	</hbox>