tazwok rev 413 4.3
Merge bugfixes from default
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Sat Mar 05 00:25:38 2011 +0100 (2011-03-05) |
parents | 5ec3a6da88e6 b1722e3faf34 |
children | 29d4bb153baa |
files | tazwok |
line diff
1.1 --- a/tazwok Fri Mar 04 19:50:26 2011 +0100 1.2 +++ b/tazwok Sat Mar 05 00:25:38 2011 +0100 1.3 @@ -1283,14 +1283,15 @@ 1.4 fi 1.5 report step "Updating packages lists: $pkg_repository" 1.6 packages_db_start 1.7 - 1.8 + 1.9 # Look for removed/update packages. 1.10 + touch stamp -r packages.list 1.11 for PACKAGE in $(grep ^[0-9,a-z,A-Z] packages.txt); do 1.12 pkg="$pkg_repository/$(grep -m1 ^$PACKAGE- packages.list).tazpkg" 1.13 if ! [ -f "$pkg" ]; then 1.14 erase_package_info 1.15 else 1.16 - if [ "$pkg" -nt "packages.list" ]; then 1.17 + if [ "$pkg" -nt "stamp" ]; then 1.18 updated_pkg="$updated_pkg 1.19 $PACKAGE $pkg" 1.20 elif [ ! -f $WOK/$PACKAGE/receipt ] && \ 1.21 @@ -1313,6 +1314,7 @@ 1.22 fi 1.23 fi 1.24 done 1.25 + rm stamp 1.26 echo "$updated_pkg" | sed 1d | while read PACKAGE pkg; do 1.27 erase_package_info 1.28 get_packages_info 1.29 @@ -1522,7 +1524,7 @@ 1.30 source $RECEIPT 1.31 [ "$WANTED" ] || continue 1.32 wan_info=$(echo -e $PACKAGE"\t"$WANTED) 1.33 - [ "$wan_info" = "$(grep -m1 ^$PACKAGE$'\t' $wan_db 2>/dev/null)" ] && return 1.34 + [ "$wan_info" = "$(grep -m1 ^$PACKAGE$'\t' $wan_db 2>/dev/null)" ] && continue 1.35 sed "/^$PACKAGE\t/d" -i $wan_db 1.36 echo "$wan_info" >> $wan_db 1.37 plan_regen_cookorder=yes