tazwok rev 201
Automated merge with http://repos.slitaz.org/tazwok-experimental
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Wed Jan 26 21:45:29 2011 +0100 (2011-01-26) |
parents | 874d0f334cbd 84421db4cf81 |
children | dbf006430b6e |
files | tazwok |
line diff
1.1 --- a/tazwok Wed Jan 26 04:52:32 2011 +0000 1.2 +++ b/tazwok Wed Jan 26 21:45:29 2011 +0100 1.3 @@ -1044,7 +1044,7 @@ 1.4 1.5 # Look for new packages. 1.6 for pkg in $(echo $pkg_repository/*.tazpkg | fgrep -v '*'); do 1.7 - if ! fgrep " ${pkg##*/}" $pkg_repository/packages.md5; then 1.8 + if ! fgrep -q " ${pkg##*/}" $pkg_repository/packages.md5; then 1.9 get_packages_info 1.10 fi 1.11 done 1.12 @@ -1436,7 +1436,6 @@ 1.13 } 1.14 # 1.15 ############################################################## 1.16 - mkdir -p $tmp 1.17 for PACKAGE in $(echo $pkg_list | filter); do 1.18 look_for_$look_for 1.19 done | tr ' ' '\n' | sort -u > $tmp/list 1.20 @@ -1964,7 +1963,6 @@ 1.21 # List dependencies to rebuild wok, or only a package 1.22 get_tazwok_config 1.23 if [ "$PACKAGE" = toolchain-cooklist ]; then 1.24 - mkdir -p $tmp 1.25 scan "$SLITAZ_TOOLCHAIN $SLITAZ_TOOLCHAIN_EXTRA" \ 1.26 --cooklist 1.27 elif [ ! "$PACKAGE" ] || [ "$PACKAGE" = toolchain ]; then 1.28 @@ -2285,7 +2283,6 @@ 1.29 get_tazwok_config 1.30 source_lib report 1.31 report start 1.32 - mkdir $tmp 1.33 gen_package 1.34 ;; 1.35 cook) 1.36 @@ -2296,7 +2293,6 @@ 1.37 get_tazwok_config 1.38 source_lib report 1.39 report start 1.40 - mkdir -p $tmp 1.41 cook 1.42 ;; 1.43 sort-cooklist) 1.44 @@ -2307,7 +2303,6 @@ 1.45 get_tazwok_config 1.46 source_lib report 1.47 report start 1.48 - mkdir -p $tmp 1.49 cooklist=$LIST 1.50 sort_cooklist 1.51 cp -af $tmp/cooklist $cooklist 1.52 @@ -2320,7 +2315,6 @@ 1.53 get_tazwok_config 1.54 source_lib report 1.55 report start 1.56 - mkdir -p $tmp 1.57 cooklist=${LIST:-$PACKAGES_REPOSITORY/cooklist} 1.58 if [ "$LIST" ]; then 1.59 sort_cooklist 1.60 @@ -2424,7 +2418,6 @@ 1.61 1.62 # Use report shared library to control output. 1.63 tmp=/tmp/tazwok-$$ 1.64 - mkdir $tmp 1.65 source_lib report 1.66 dbtype=packages 1.67 mode=update 1.68 @@ -2634,12 +2627,11 @@ 1.69 echo "No tarball to download for $PACKAGE" 1.70 fi 1.71 ;; 1.72 - check-commit) 1.73 + rec-commit) 1.74 check_root 1.75 get_tazwok_config 1.76 source_lib report 1.77 report start 1.78 - mkdir -p $tmp 1.79 check_for_commit 1.80 gen_cook_list 1.81 ;; 1.82 @@ -2648,7 +2640,6 @@ 1.83 get_tazwok_config 1.84 source_lib report 1.85 report start 1.86 - mkdir -p $tmp 1.87 check_for_commit 1.88 # 2) update cook-database (actually complete regeneration) 1.89 dbtype=wok 1.90 @@ -2665,7 +2656,6 @@ 1.91 get_tazwok_config 1.92 source_lib report 1.93 report start 1.94 - mkdir -p $tmp 1.95 # 2) update cook-database (actually complete regeneration) 1.96 dbtype=wok 1.97 mode=gen 1.98 @@ -2688,7 +2678,6 @@ 1.99 get_tazwok_config 1.100 source_lib report 1.101 report start 1.102 - mkdir $tmp 1.103 dbtype=wok 1.104 mode=gen 1.105 files_list="$dep_db $wan_db $PACKAGE_REPOSITORY/cookorder.txt" 1.106 @@ -2709,17 +2698,8 @@ 1.107 get_tazwok_config 1.108 source_lib report 1.109 report start 1.110 - mkdir $tmp 1.111 check_for_incoming 1.112 ;; 1.113 - remove-old) 1.114 - check_root 1.115 - get_tazwok_config 1.116 - source_lib report 1.117 - report start 1.118 - mkdir $tmp 1.119 - remove_old_packages 1.120 - ;; 1.121 configure-chroot) 1.122 check_root 1.123 get_tazwok_config