# HG changeset patch # User Christopher Rogers # Date 1296433787 0 # Node ID 003d6e430c9399244510ef48c4e97ac2061347ee # Parent 2f4f55db2600e11431d2e7e88cd29e035288b16e Fixed tazpkg to not redownload undigest packages everytime with get-install. Also replace /var/lib/tazpkg with in some places. diff -r 2f4f55db2600 -r 003d6e430c93 tazpkg --- a/tazpkg Fri Jan 28 23:03:37 2011 +0100 +++ b/tazpkg Mon Jan 31 00:29:47 2011 +0000 @@ -1021,9 +1021,9 @@ { DEFAULT_DEPENDS="glibc-base gcc-lib-base" - [ -f /var/lib/tazpkg/files.list.lzma ] || tazpkg recharge > /dev/null - for i in /var/lib/tazpkg/files.list.lzma \ - /var/lib/tazpkg/undigest/*/files.list.lzma ; do + [ -f $LOCALSTATE/files.list.lzma ] || tazpkg recharge > /dev/null + for i in $LOCALSTATE/files.list.lzma \ + $LOCALSTATE/undigest/*/files.list.lzma ; do [ -f $i ] && lzma d $i -so >> $TMP_DIR/files.list done find $TMP_DIR/$file/fs -type f | while read chkfile ; do @@ -1814,7 +1814,7 @@ echo "" exit 0 fi - rm /var/lib/tazpkg/mirror + rm $LOCALSTATE/mirror echo "$RELEASE" > /etc/slitaz-release tazpkg recharge && tazpkg upgrade @@ -2584,7 +2584,7 @@ check_for_package_in_list echo "" if [ -f $PACKAGE.tazpkg ]; then - if [ "$(md5sum $PACKAGE.tazpkg)" != "$(fgrep " $PACKAGE.tazpkg" /var/lib/tazpkg/packages.md5)" ]; then + if [ "$(md5sum $PACKAGE.tazpkg)" != "$(fgrep " $PACKAGE.tazpkg" $LOCALSTATE/$undigest/packages.md5)" ]; then rm -f $PACKAGE.tazpkg download $PACKAGE.tazpkg fi @@ -2632,7 +2632,16 @@ eval_gettext "Continuing \$PACKAGE download"; echo download $PACKAGE.tazpkg } - if [ "$(md5sum $PACKAGE.tazpkg)" != "$(fgrep " $PACKAGE.tazpkg" /var/lib/tazpkg/packages.md5)" ]; then + if [ -f $LOCALSTATE/priority ]; then + for i in $(cat $LOCALSTATE/priority); do + if [ -f $LOCALSTATE/undigest/$i/packages.md5 ]; then + if [ "$(md5sum $PACKAGE.tazpkg)" != "$(fgrep " $PACKAGE.tazpkg" $LOCALSTATE/undigest/$i/packages.md5)" ]; then + rm -f $PACKAGE.tazpkg + download $PACKAGE.tazpkg + fi + fi + done + elif [ "$(md5sum $PACKAGE.tazpkg)" != "$(fgrep " $PACKAGE.tazpkg" $LOCALSTATE/packages.md5)" ]; then rm -f $PACKAGE.tazpkg download $PACKAGE.tazpkg fi