tazwok rev 97

Check WANTED too
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Oct 05 23:41:46 2008 +0000 (2008-10-05)
parents d335ff8c479f
children 143fe275fe64
files tazwok
line diff
     1.1 --- a/tazwok	Fri Oct 03 08:56:44 2008 +0000
     1.2 +++ b/tazwok	Sun Oct 05 23:41:46 2008 +0000
     1.3 @@ -311,7 +311,7 @@
     1.4  				echo "untaring $TARBALL" >> $LOG
     1.5  				echo -n "Untaring $TARBALL... "
     1.6  				case "$TARBALL" in
     1.7 -				*zip) ( cd $WOK/$PACKAGE; unzip $SOURCES_REPOSITORY/$TARBALL );;
     1.8 +				*zip) ( cd $WOK/$PACKAGE; unzip -o $SOURCES_REPOSITORY/$TARBALL );;
     1.9  				*bz2) tar xjf $SOURCES_REPOSITORY/$TARBALL -C $WOK/$PACKAGE;;
    1.10  				*tar) tar xf $SOURCES_REPOSITORY/$TARBALL -C $WOK/$PACKAGE;;
    1.11  				*Z) tar xZf $SOURCES_REPOSITORY/$TARBALL -C $WOK/$PACKAGE;;
    1.12 @@ -519,8 +519,8 @@
    1.13  		[ -f "fs$file" ] || continue
    1.14  		md5sum "fs$file" | sed 's/  fs/  /'
    1.15  	done < files.list > md5sum
    1.16 +	#[ -s md5sum ] || rm -f md5sum
    1.17  	status
    1.18 -	[ -s md5sum ] || rm -f md5sum
    1.19  	UNPACKED_SIZE=$(du -chs fs receipt files.list md5sum description.txt \
    1.20  		2> /dev/null | awk '{ sz=$1 } END { print sz }')
    1.21  	# Build cpio archives. Find, cpio and gzip the fs, finish by
    1.22 @@ -613,11 +613,12 @@
    1.23  	local date
    1.24  	local mon
    1.25  	# Default date is Jan 1 1970
    1.26 -	[ -d $WOK/.hg -a -x /usr/bin/hg ] || { echo "0"; return; }
    1.27 +	[ -d $WOK/.hg -a -x /usr/bin/hg ] || { echo "010100001970"; return; }
    1.28  	pkg=$(basename $1)
    1.29  	# Get date for last commit
    1.30  	date="$( cd $WOK; hg log $(find $pkg/receipt $pkg/stuff -type f \
    1.31  		2> /dev/null) | grep date: | head -1 | cut -c 6-)"
    1.32 +	[ -n "$date" ] || { echo "010100001970"; return; }
    1.33  	case "$(echo $date | awk '{ print $2 }')" in
    1.34  	Jan) mon="01";; Feb) mon="02";; Mar) mon="03";; Apr) mon="04";; 
    1.35  	May) mon="05";; Jun) mon="06";; Jul) mon="07";; Aug) mon="08";; 
    1.36 @@ -663,9 +664,21 @@
    1.37  			WEB_SITE=""
    1.38  			DEPENDS=""
    1.39  			BUILD_DEPENDS=""
    1.40 +			WANTED=""
    1.41  			. $pkg/receipt
    1.42  			[ "$PACKAGE" = "$pkg" ] || echo "Package $PACKAGE should be $pkg"
    1.43  			[ -n "$VERSION" ] || echo "Package $PACKAGE has no VERSION"
    1.44 +			if [ -n "$WANTED" ]; then
    1.45 +				if [ ! -f $WANTED/receipt ]; then
    1.46 +					echo "Package $PACKAGE want unknown $WANTED package"
    1.47 +				else
    1.48 +					BASEVERSION=$(. $WANTED/receipt ; echo $VERSION)
    1.49 +					if [ "$VERSION" != "$BASEVERSION" ]; then
    1.50 +						echo "Package $PACKAGE ($VERSION) want $WANTED ($BASEVERSION)"
    1.51 +					fi
    1.52 +				fi
    1.53 +			fi
    1.54 +
    1.55  			if [ -n "$CATEGORY" ]; then
    1.56  				case " $(echo $CATEGORIES) " in
    1.57  				*\ $CATEGORY\ *);;
    1.58 @@ -718,6 +731,9 @@
    1.59  			elif [ -f $pkg/taz/*/receipt -a ! -f $pkg/taz/*/md5sum ]; then
    1.60  				echo "Obsolete package: $PACKAGE ($VERSION)"
    1.61  				echo "$PACKAGE" >> /tmp/pkgs.missing.$$
    1.62 +			elif [ $pkg/receipt -nt $tpkg ]; then
    1.63 +				echo "Refresh package: $PACKAGE ($VERSION)"
    1.64 +				echo "$PACKAGE" >> /tmp/pkgs.missing.$$
    1.65  			else
    1.66  				srcdate=$(hgdate $pkg)
    1.67  				pkgdate=$(date -u -r $tpkg '+%m%d%H%M%Y')