tazpkg rev 178
tazpkgbox: add blocked tab
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Oct 24 08:27:54 2008 +0000 (2008-10-24) |
parents | 581aefe7fad7 |
children | 974fdbd190db |
files | lib/tazpkgbox/list lib/tazpkgbox/package_infos tazpkgbox |
line diff
1.1 --- a/lib/tazpkgbox/list Thu Oct 23 09:43:26 2008 +0000 1.2 +++ b/lib/tazpkgbox/list Fri Oct 24 08:27:54 2008 +0000 1.3 @@ -25,6 +25,19 @@ 1.4 done 1.5 } 1.6 1.7 +blocked_list() 1.8 +{ 1.9 + for pkg in /var/lib/tazpkg/installed/* 1.10 + do 1.11 + . $pkg/receipt 1.12 + if grep -qs "^$(basename $pkg)$" /var/lib/tazpkg/blocked-packages.list; then 1.13 + AVAILABLE=$(grep "^$(basename $pkg) " /var/lib/tazpkg/packages.desc | awk '{ print $3 }') 1.14 + 1.15 + echo "$PACKAGE|$VERSION|$AVAILABLE|$SHORT_DESC" 1.16 + fi 1.17 + done 1.18 +} 1.19 + 1.20 case $1 in 1.21 installed) 1.22 CAT=`cat /tmp/tazpkgbox/installed-category` 1.23 @@ -43,8 +56,10 @@ 1.24 else 1.25 grep "$CAT" /var/lib/tazpkg/packages.desc 1.26 fi ;; 1.27 + blocked) 1.28 + blocked_list;; 1.29 *) 1.30 - echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|installable|mirrored]" ;; 1.31 + echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|installable|mirrored|blocked]" ;; 1.32 esac 1.33 1.34 exit 0
2.1 --- a/lib/tazpkgbox/package_infos Thu Oct 23 09:43:26 2008 +0000 2.2 +++ b/lib/tazpkgbox/package_infos Fri Oct 24 08:27:54 2008 +0000 2.3 @@ -29,6 +29,9 @@ 2.4 else 2.5 echo -n "$(stat -c "[configuration: %.16y]" $file)" 2.6 fi;; 2.7 + #* if [ "$(tazpkg check-file $file $2)" = "failure" ]; then 2.8 + # echo -n "Invalid md5" 2.9 + # fi;; 2.10 esac 2.11 fi 2.12 echo "" 2.13 @@ -73,6 +76,11 @@ 2.14 fi 2.15 done 2.16 LIST_PKGS="$LIST_PKGS 2.17 + <action>echo "\$PKG" > /tmp/tazpkgbox/pkg</action> 2.18 + <action>/usr/lib/slitaz/tazpkgbox/package_infos</action> 2.19 + <action>refresh:PKG</action> 2.20 + <action>refresh:PKG_STATS</action> 2.21 + <action>refresh:CACHE_STATS</action> 2.22 </tree> 2.23 <hbox> 2.24 <button ok>
3.1 --- a/tazpkgbox Thu Oct 23 09:43:26 2008 +0000 3.2 +++ b/tazpkgbox Fri Oct 24 08:27:54 2008 +0000 3.3 @@ -111,7 +111,7 @@ 3.4 </pixmap> 3.5 </hbox> 3.6 3.7 - <notebook labels="Installed|Installable|Mirrored|Search|Configuration"> 3.8 + <notebook labels="Installed|Installable|Mirrored|Blocked|Search|Configuration"> 3.9 3.10 <vbox> 3.11 <tree> 3.12 @@ -228,6 +228,9 @@ 3.13 <action>refresh:CACHE_STATS</action> 3.14 </tree> 3.15 <hbox> 3.16 + <text> 3.17 + <label>"Category:"</label> 3.18 + </text> 3.19 <combobox> 3.20 <variable>MIRRORED_CAT</variable> 3.21 <item>all</item> 3.22 @@ -263,6 +266,17 @@ 3.23 </vbox> 3.24 3.25 <vbox> 3.26 + <tree> 3.27 + <width>620</width><height>240</height> 3.28 + <variable>BLOCKED</variable> 3.29 + <label>Package name|Version|Available|Description</label> 3.30 + <input>/usr/lib/slitaz/tazpkgbox/list blocked</input> 3.31 + <action>echo "$BLOCKED" > /tmp/tazpkgbox/pkg</action> 3.32 + <action>/usr/lib/slitaz/tazpkgbox/package_infos</action> 3.33 + </tree> 3.34 + </vbox> 3.35 + 3.36 + <vbox> 3.37 <tree icon="tazpkg"> 3.38 <width>620</width><height>120</height> 3.39 <variable>RESULT_INSTALLED</variable> 3.40 @@ -397,7 +411,7 @@ 3.41 3.42 <hbox> 3.43 <text wrap="false"> 3.44 - <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> 3.45 + <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> 3.46 <variable>PKG_STATS</variable> 3.47 </text> 3.48 </hbox>