tazwok rev 306
Typo & minor improvements to check_for_incoming()
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Fri Feb 18 01:40:41 2011 +0100 (2011-02-18) |
parents | 434b101698f0 |
children | cd06d1768e60 |
files | tazwok |
line diff
1.1 --- a/tazwok Fri Feb 18 01:32:08 2011 +0100 1.2 +++ b/tazwok Fri Feb 18 01:40:41 2011 +0100 1.3 @@ -1899,7 +1899,7 @@ 1.4 if [ "$missingpkg" ]; then 1.5 echo "Don't move incoming packages to main repository because theses ones are broken:" >&2 1.6 echo "$missingpkg" 1.7 - return 1 1.8 + exit 1 1.9 fi 1.10 fi 1.11 if [ -s $PACKAGES_REPOSITORY/cooklist ]; then 1.12 @@ -1907,10 +1907,10 @@ 1.13 if [ "$missingpkg" ]; then 1.14 echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2 1.15 echo "$missingpkg" 1.16 - return 1 1.17 + exit 1 1.18 fi 1.19 fi 1.20 - incomming_pkgs="$(cut -f 1 -d '|' $INCOMING_REPOSITORY/packages.desc)" 1.21 + incoming_pkgs="$(cut -f 1 -d '|' $INCOMING_REPOSITORY/packages.desc)" 1.22 if ! [ "$forced" ]; then 1.23 cooklist=$PACKAGES_REPOSITORY/cooklist 1.24 gen_cook_list 1.25 @@ -1919,13 +1919,13 @@ 1.26 if [ "$missingpkg" ]; then 1.27 echo "Don't move incoming packages to main repository because theses ones needs to be cooked:" >&2 1.28 echo "$missingpkg" 1.29 - return 1 1.30 + exit 1 1.31 fi 1.32 fi 1.33 fi 1.34 report step "Moving incoming packages to main repository" 1.35 unset EXTRAVERSION 1.36 - for PACKAGE in $incomming_pkgs; do 1.37 + for PACKAGE in $incoming_pkgs; do 1.38 prev_VERSION=$(get_pkg_version $PACKAGES_REPOSITORY) 1.39 VERSION=$(get_pkg_version $INCOMING_REPOSITORY) 1.40 remove_previous_package $PACKAGES_REPOSITORY