tazwok rev 399 4.3

Generate repository ID, generate wok-wanted.txt/wok-depends.txt in main repository, update scan() subfunctions to use good pathes when using --undigest. (4.3)
author Antoine Bodin <gokhlayeh@slitaz.org>
date Thu Mar 03 22:38:29 2011 +0100 (2011-03-03)
parents 12826f6ad117
children 83afa4ea8ba6
files tazwok
line diff
     1.1 --- a/tazwok	Thu Mar 03 22:32:19 2011 +0100
     1.2 +++ b/tazwok	Thu Mar 03 22:38:29 2011 +0100
     1.3 @@ -1381,6 +1381,11 @@
     1.4  	sed "/^$PACKAGE:/d" -i files.list
     1.5  	sed "/^$(basename ${pkg%.tazpkg})$/d" -i packages.list
     1.6  	sed "/ $(basename $pkg)$/d" -i packages.md5
     1.7 +	[ "$pkg_repository" != "$PACKAGES_REPOSITORY" ] && return 0	
     1.8 +	for i in wok-wanted.txt wok-depends.txt; do
     1.9 +		[ -f $i ] || continue
    1.10 +		sed "/^$PACKAGE\t/d" -i $i
    1.11 +	done
    1.12  }
    1.13  
    1.14  get_packages_info()
    1.15 @@ -1431,6 +1436,11 @@
    1.16  	[ ! "$package_md5" ] && package_md5=$(md5sum $(basename $pkg))
    1.17  	echo "$package_md5" >> packages.md5
    1.18  	unset package_md5
    1.19 +
    1.20 +	if [ "$pkg_repository" = "$PACKAGES_REPOSITORY" ]; then
    1.21 +		[ "$WANTED" ] && echo -e "$PACKAGE\t$WANTED" >> wok-wanted.txt
    1.22 +		echo -e "$PACKAGE\t "$DEPENDS" \t "$BUILD_DEPENDS" " >> wok-package.txt
    1.23 +	fi
    1.24  }
    1.25  
    1.26  source_receipt()
    1.27 @@ -1451,10 +1461,14 @@
    1.28  	# If lists was updated it's generally needed to sort them well.
    1.29  	if ! sort -c packages.list 2> /dev/null; then
    1.30  		report step "Sorting packages lists"
    1.31 -		for file in packages.list packages.desc packages.equiv; do
    1.32 +		files_list="packages.list packages.desc packages.equiv"
    1.33 +		[ "$pkg_repository" = "$PACKAGES_REPOSITORY" ] && \
    1.34 +			files_list="$files_list wok-wanted.txt wok-depends.txt"
    1.35 +		for file in $files_list; do
    1.36  			[ -f $file ] || continue
    1.37  			sort -o $file $file
    1.38  		done
    1.39 +		md5sum packages.md5 | cut -f1 -d' ' > ID
    1.40  		report end-step
    1.41  	fi
    1.42  	
    1.43 @@ -1596,11 +1610,9 @@
    1.44  look_for_dep()
    1.45  {
    1.46  	if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then
    1.47 -		grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \
    1.48 -			| cut -f 2
    1.49 +		grep -m1 ^$PACKAGE$'\t' $ref_dep_db | cut -f 2
    1.50  	else
    1.51 -		grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-depends.txt | \
    1.52 -			cut -f 2
    1.53 +		grep -m1 ^$PACKAGE$'\t' $dep_db | cut -f 2
    1.54  	fi
    1.55  }
    1.56  
    1.57 @@ -1612,19 +1624,17 @@
    1.58  look_for_all()
    1.59  {
    1.60  	if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then
    1.61 -		grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \
    1.62 -			| cut -f 2,3 | sed 's/ 	 / /'
    1.63 +		grep -m1 ^$PACKAGE$'\t' $ref_dep_db | cut -f 2,3 | sed 's/ 	 / /'
    1.64  	else
    1.65 -		grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-depends.txt | \
    1.66 -			cut -f 2,3 | sed 's/ 	 / /'
    1.67 +		grep -m1 ^$PACKAGE$'\t' $dep_db | cut -f 2,3 | sed 's/ 	 / /'
    1.68  	fi
    1.69  }
    1.70  
    1.71  look_for_rdep()
    1.72  {
    1.73 -	fgrep ' '$PACKAGE' ' $INCOMING_REPOSITORY/wok-depends.txt | cut -f 1
    1.74 +	fgrep ' '$PACKAGE' ' $dep_db | cut -f 1
    1.75  	if [ "$undigest" ]; then
    1.76 -		for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt | cut -f 1); do
    1.77 +		for rdep in $(fgrep ' '$PACKAGE' ' $ref_dep_db | cut -f 1); do
    1.78  			if [ ! -f "WOK$/$rdep/receipt" ]; then
    1.79  				echo "$rdep"
    1.80  			fi
    1.81 @@ -1634,34 +1644,32 @@
    1.82  
    1.83  look_for_rbdep()
    1.84  {
    1.85 -	fgrep ' '$PACKAGE' ' $INCOMING_REPOSITORY/wok-depends.txt | \
    1.86 -		cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1
    1.87 +	fgrep ' '$PACKAGE' ' $dep_db | cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1
    1.88  	if [ "$undigest" ]; then
    1.89 -		for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \
    1.90 -			| cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1); do
    1.91 +		for rdep in $(fgrep ' '$PACKAGE' ' $ref_dep_db | cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1); do
    1.92  			if [ ! -f "WOK$/$rdep/receipt" ]; then
    1.93  				echo "$rdep"
    1.94  			fi
    1.95  		done
    1.96 -	fi	
    1.97 +	fi
    1.98  }
    1.99  
   1.100  # Return WANTED if it exists.
   1.101  look_for_wanted()
   1.102  {
   1.103  	if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then
   1.104 -		grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-wanted.txt | cut -f 2
   1.105 +		grep -m1 ^$PACKAGE$'\t' $ref_wan_db | cut -f 2
   1.106  	else
   1.107 -		grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 2
   1.108 +		grep -m1 ^$PACKAGE$'\t' $wan_db | cut -f 2
   1.109  	fi
   1.110  }
   1.111  
   1.112  # Return packages which wants PACKAGE.
   1.113  look_for_rwanted()
   1.114  {
   1.115 -	grep $'\t'$PACKAGE$ $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 1
   1.116 +	grep $'\t'$PACKAGE$ $wan_db | cut -f 1
   1.117  	if [ "$undigest" ]; then
   1.118 -		for rwanted in $(grep $'\t'$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-wanted.txt | cut -f 1); do
   1.119 +		for rwanted in $(grep $'\t' $ref_wan_db | cut -f 1); do
   1.120  			if [ ! -f "$WOK/$rwanted/receipt" ]; then
   1.121  				echo "$rwanted"
   1.122  			fi
   1.123 @@ -1674,13 +1682,13 @@
   1.124  	WANTED=$(look_for_wanted)
   1.125  	if [ "$WANTED" ]; then
   1.126  		if [ "$undigest" ] && [ ! -f "$WOK/$WANTED/receipt" ]; then
   1.127 -			[ -f "$SLITAZ_DIR/$SLITAZ_VERSION/wok/$WANTED-dev/receipt" ] && echo $WANTED-dev
   1.128 +			grep -q ^$WANTED-dev$'\t' $ref_dep_db && echo $WANTED-dev
   1.129  		else
   1.130  			[ -f "$WOK/$WANTED-dev/receipt" ] && echo $WANTED-dev
   1.131  		fi
   1.132  	fi
   1.133  	if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then
   1.134 -		[ -f "$SLITAZ_DIR/$SLITAZ_VERSION/wok/$PACKAGE-dev/receipt" ] && echo $PACKAGE-dev
   1.135 +			grep -q ^$PACKAGE-dev$'\t' $ref_dep_db && echo $PACKAGE-dev
   1.136  	else
   1.137  		[ -f "$WOK/$PACKAGE-dev/receipt" ] && echo $PACKAGE-dev
   1.138  	fi