SliTaz Repositories

     1.1 --- a/tazwok	Tue Feb 15 02:05:39 2011 +0100
     1.2 +++ b/tazwok	Tue Feb 15 02:31:35 2011 +0100
     1.3 @@ -434,7 +434,7 @@
     1.4  check_for_tarball()
     1.5  {
     1.6  	[ "$WGET_URL" ] || return 0
     1.7 -	report step "Checking for source tarball"
     1.8 +	report step "Checking for source tarball: $PACKAGE"
     1.9  	local repack_src TARBALL
    1.10  	if [ "$repack_src" = yes ] && look_for_cookopt !repack_src; then
    1.11  			repack_src=no
    1.12 @@ -728,7 +728,7 @@
    1.13  					if [ "${WGET_URL%$TARBALL}" = "$WGET_URL" ] && [ "$file" = "$WGET_URL" ]; then
    1.14  						wget -q --no-check-certificate -O $TARBALL $file && break
    1.15  					else
    1.16 -						wget -q --no-check-certificate $file && break						
    1.17 +						wget -q --no-check-certificate $file && break
    1.18  					fi
    1.19  				else
    1.20  					tazwok_warning "Needs wget to download the source tarball from $file, please add it as build-depend."
    1.21 @@ -1893,22 +1893,32 @@
    1.22  	echo "No packages in $INCOMING_REPOSITORY."
    1.23  	return; }
    1.24  	if [ -s $PACKAGES_REPOSITORY/broken ]; then
    1.25 -		echo "Don't move incoming packages to main repository because theses ones are broken:
    1.26 -		$(cat $PACKAGES_REPOSITORY/broken)" >&2
    1.27 -		return
    1.28 +		missingpkg=$(look_for_missing_pkg broken)
    1.29 +		if [ "$missingpkg" ]; then
    1.30 +			echo "Don't move incoming packages to main repository because theses ones are broken:" >&2
    1.31 +			echo "$missingpkg"
    1.32 +			return 1
    1.33 +		fi
    1.34  	fi
    1.35  	if [ -s $PACKAGES_REPOSITORY/cooklist ]; then
    1.36 -		echo "Don't move incoming packages to main repository because some of them need to be cooked:
    1.37 -		$(cat $PACKAGES_REPOSITORY/cooklist)" >&2
    1.38 -		return
    1.39 +		missingpkg=$(look_for_missing_pkg cooklist)
    1.40 +		if [ "$missingpkg" ]; then
    1.41 +			echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2
    1.42 +			echo "$missingpkg"
    1.43 +			return 1
    1.44 +		fi
    1.45  	fi
    1.46  	pkg="$(cut -f 1 -d '|' $INCOMING_REPOSITORY/packages.desc)"
    1.47  	if ! [ "$forced" ]; then
    1.48  		cooklist=$PACKAGES_REPOSITORY/cooklist
    1.49  		gen_cook_list
    1.50  		if [ -s $PACKAGES_REPOSITORY/cooklist ]; then
    1.51 -			echo "Don't move incoming packages to main repository because some of them need to be cooked." >&2
    1.52 -			return
    1.53 +			missingpkg=$(look_for_missing_pkg cooklist)
    1.54 +			if [ "$missingpkg" ]; then
    1.55 +				echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2
    1.56 +				echo "$missingpkg"
    1.57 +				return 1
    1.58 +			fi
    1.59  		fi
    1.60  	fi
    1.61  	report step "Moving incoming packages to main repository"
    1.62 @@ -2898,7 +2908,6 @@
    1.63  			source_lib report
    1.64  			report start
    1.65  			check_for_tarball
    1.66 -			[ -x /usr/bin/clean-chroot ] && clean-chroot
    1.67  		else
    1.68  			echo "No tarball to download for $PACKAGE"
    1.69  		fi