tazlito rev 112

pack-flavor: look for undigest mirrors
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Nov 07 13:28:44 2009 +0100 (2009-11-07)
parents 536536d6001a
children 1f0a9a164e71
files tazlito
line diff
     1.1 --- a/tazlito	Sat Oct 03 21:59:10 2009 +0200
     1.2 +++ b/tazlito	Sat Nov 07 13:28:44 2009 +0100
     1.3 @@ -492,7 +492,8 @@
     1.4  	set -- $(get_size $pkg)
     1.5  	packed_size=$(( $packed_size + $1 ))
     1.6  	unpacked_size=$(( $unpacked_size + $2 ))
     1.7 -	for i in $(grep ^$pkg /var/lib/tazpkg/packages.list); do
     1.8 +	for i in $(grep -hs ^$pkg /var/lib/tazpkg/packages.list \
     1.9 +				  $TMP_DIR/packages.list); do
    1.10  		echo $i
    1.11  		break
    1.12  	done
    1.13 @@ -995,9 +996,13 @@
    1.14  			mkdir $TMP_DIR
    1.15  			echo -n "Create $FLAVOR..."
    1.16  			[ -s /var/lib/tazpkg/packages.list ] || tazpkg recharge
    1.17 -			[ -s $FLAVORS_REPOSITORY/$FLAVOR/mirrors ] &&
    1.18 +			if [ -s $FLAVORS_REPOSITORY/$FLAVOR/mirrors ]; then
    1.19  				cp $FLAVORS_REPOSITORY/$FLAVOR/mirrors \
    1.20  					$TMP_DIR/$FLAVOR.mirrors
    1.21 +				for i in $(cat $TMP_DIR/$FLAVOR.mirrors); do
    1.22 +					wget -O - $i/packages.list >> $TMP_DIR/packages.list
    1.23 +				done
    1.24 +			fi
    1.25  			[ -s $FLAVORS_REPOSITORY/$FLAVOR/packages.list ] &&
    1.26  			get_pkglist $FLAVOR > $TMP_DIR/$FLAVOR.pkglist
    1.27  			if grep -q ^ROOTFS_SELECTION \
    1.28 @@ -1060,6 +1065,7 @@
    1.29  ================================================================================
    1.30  
    1.31  EOT
    1.32 +			rm -f $TMP_DIR/packages.list
    1.33  			( cd $TMP_DIR ; ls | cpio -o -H newc ) | gzip -9 > \
    1.34  				$FLAVOR.flavor
    1.35  			status