tazpkg rev 483
Fix: skip blocked packages on 'up'
author | Ben Arnold <ben@seawolfsanctuary.com> |
---|---|
date | Sun May 01 20:14:49 2011 +0100 (2011-05-01) |
parents | 41cafbbb2783 |
children | de46df482cf8 |
files | tazpkg |
line diff
1.1 --- a/tazpkg Mon Apr 18 04:58:12 2011 +0200 1.2 +++ b/tazpkg Sun May 01 20:14:49 2011 +0100 1.3 @@ -2377,6 +2377,7 @@ 1.4 separator 1.5 cd $LOCALSTATE/installed 1.6 echo "" > $UP_LIST 1.7 + blocked_count=0 1.8 for pkg in * 1.9 do 1.10 VERSION="" 1.11 @@ -2388,14 +2389,19 @@ 1.12 # Skip when not found on mirror (local package) 1.13 grep -q ^$PACKAGE- ../packages.list || continue 1.14 new=`fgrep "$PACKAGE |" ../packages.desc | awk '{print $3}'` 1.15 - if [ "$VERSION" == "$new" ]; then 1.16 - echo -n "$PACKAGE" 1.17 - echo -e "\033[26G `gettext \"New build :\"` $md5" 1.18 + if `grep -qs "^$PACKAGE" $BLOCKED`; then 1.19 + # Skip pkgs listed in $LOCALSTATE/blocked-packages.list 1.20 + blocked_count=$(($blocked_count+1)) 1.21 else 1.22 - echo -n "$PACKAGE" 1.23 - echo -e "\033[26G `gettext \"New version :\"` $new" 1.24 + if [ "$VERSION" == "$new" ]; then 1.25 + echo -n "$PACKAGE" 1.26 + echo -e "\033[26G `gettext \"New build :\"` $md5" 1.27 + else 1.28 + echo -n "$PACKAGE" 1.29 + echo -e "\033[26G `gettext \"New version :\"` $new" 1.30 + fi 1.31 + echo "$PACKAGE" >> $UP_LIST 1.32 fi 1.33 - echo "$PACKAGE" >> $UP_LIST 1.34 fi 1.35 done 1.36 sed -i /^$/d $UP_LIST 1.37 @@ -2407,7 +2413,10 @@ 1.38 else 1.39 separator 1.40 echo -en "\033[1m" 1.41 - eval_gettext "You have \$upnb available upgrades on \$pkgs installed packages" 1.42 + if [ "$blocked_count" -gt 0 ]; then 1.43 + blocks=`eval_gettext " (\$blocked_count blocked)"` 1.44 + fi 1.45 + eval_gettext "You have \$upnb available upgrades\$blocks on \$pkgs installed packages" 1.46 echo -e "\033[0m\n" 1.47 fi 1.48 # Pkgs to upgrade ? Skip, let install them all or ask user