cookutils rev 746
cook pkgdb: better handle absent packages, make sure to get "mirrors" and "extra.list" for recharge bundle
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Tue Jun 30 14:24:13 2015 +0300 (2015-06-30) |
parents | 85f682116a0c |
children | 1a9727209f13 |
files | cook |
line diff
1.1 --- a/cook Mon Jun 22 12:29:02 2015 +0300 1.2 +++ b/cook Tue Jun 30 14:24:13 2015 +0300 1.3 @@ -1539,7 +1539,10 @@ 1.4 # list of duplicates 1.5 sed -i "/ $PACKAGE-$VERSION$EXTRAVERSION.tazpkg/d" $PKGS/packages.toremove 1.6 else 1.7 - _ ' - absent: %s (%s)' "$PACKAGE-$VERSION$EXTRAVERSION.tazpkg" "$ARCH" | dblog 1.8 + # if receipt variable HOST_ARCH absent/empty or contains ARCH 1.9 + if [ -z "$HOST_ARCH" -o "${HOST_ARCH/$ARCH/}" != "$HOST_ARCH" ]; then 1.10 + _ ' - absent: %s (%s)' "$PACKAGE-$VERSION$EXTRAVERSION.tazpkg" "$ARCH" | dblog 1.11 + fi 1.12 fi 1.13 done 1.14 1.15 @@ -1594,8 +1597,16 @@ 1.16 # Make bundle to fast recharge 1.17 _n 'Creating file "%s"' 'bundle.tar.lzma' | dblog 1.18 [ -f bundle.tar.lzma ] && rm bundle.tar.lzma 1.19 - wget -q http://mirror1.slitaz.org/mirrors 1.20 - wget -q -O extra.list http://mirror1.slitaz.org/packages/get.list 1.21 + # Make sure to get "mirrors" file 1.22 + until [ -e 'mirrors' ]; do 1.23 + wget -q http://mirror1.slitaz.org/mirrors 1.24 + echo -n '.' | dblog; sleep 5 1.25 + done 1.26 + # Make sure to get "extra.list" file 1.27 + until [ -e 'extra.list' ]; do 1.28 + wget -q -O extra.list http://mirror1.slitaz.org/packages/get.list 1.29 + echo -n '.' | dblog; sleep 5 1.30 + done 1.31 busybox tar -chaf bundle.tar.lzma \ 1.32 mirrors extra.list files-list.md5 packages.info descriptions.txt \ 1.33 packages.desc packages.md5 packages.txt packages.list packages.equiv