# HG changeset patch # User Christophe Lincoln # Date 1333624850 -7200 # Node ID 33decfc12dc4611da576841c6804d26e31537d2f # Parent 1261d89830ee94e96d13c6ab52f3a27491037b5e Remove buggy and unneede code about mirror file, mirror MUST have only one main mirror URL (use setup-mirror to change the url) diff -r 1261d89830ee -r 33decfc12dc4 tazpkg --- a/tazpkg Thu Apr 05 12:43:45 2012 +0200 +++ b/tazpkg Thu Apr 05 13:20:50 2012 +0200 @@ -393,8 +393,8 @@ for i in $mirrors; do case "$i" in # Mirror URL can have a trailing slash or not. - http://*|ftp://*) wget -c ${i%/}/$@ && break;; - *) ln -sf $i/$1 . && break;; + http://*|ftp://*) wget -c ${i%/}/$@ && break ;; + *) ln -sf $i/$1 . && break ;; esac done } @@ -2252,6 +2252,10 @@ fi ;; recharge) # Recharge packages.list from a mirror. + # + # WARRNING: The mirrors file have all SliTaz mirrors but mirror + # must have only the choosen main mirror. + # check_root get_options_list="root forced list rootconfig" get_options @@ -2316,16 +2320,9 @@ for i in desc md5 txt list equiv; do download_from "$(cat mirror)" packages.$i done - - download_from "$(cat mirror)" files.list.lzma - + download_from "$(cat mirror)" files.list.lzma download_from "$(sed 's|packages/.*||' < mirror)" mirrors - [ -f mirrors ] || mv mirrors.bak mirrors 2> /dev/null - suffix=$(head -1 mirror) - suffix=packages${suffix#*/packages} - for i in $(cat mirrors 2> /dev/null); do - fgrep -qs $i mirror || echo $i$suffix >> mirror - done + if [ -f "packages.list.bak" ]; then diff -u packages.list.bak packages.list | grep ^+[a-z] > packages.diff sed -i s/+// packages.diff