tazwok rev 403 4.3

Merge changes from default (4.3)
author Antoine Bodin <gokhlayeh@slitaz.org>
date Fri Mar 04 03:01:03 2011 +0100 (2011-03-04)
parents 6efae71f2798 8856004dc25a
children 9ca9e6ff253b
files tazwok
line diff
     1.1 --- a/.hgtags	Thu Mar 03 22:54:47 2011 +0100
     1.2 +++ b/.hgtags	Fri Mar 04 03:01:03 2011 +0100
     1.3 @@ -18,3 +18,4 @@
     1.4  16be5005f44969f7994f8be276da444fa6d415a5 4.2.1
     1.5  57321b17f1b95df4de7c05cfc30a2eb1e394f65a 4.2.2
     1.6  44c327b2c5f807df9a580eaf6424d8096d71cad0 4.2.3
     1.7 +13e14fe449a3fd68126f9df0a0ed40a5dd5f98c6 4.2.4
     2.1 --- a/tazwok	Thu Mar 03 22:54:47 2011 +0100
     2.2 +++ b/tazwok	Fri Mar 04 03:01:03 2011 +0100
     2.3 @@ -397,7 +397,7 @@
     2.4  	rwanted=$(look_for_rwanted)
     2.5  
     2.6  	for pkg in $(scan $PACKAGE --look_for=bdep --with_dev | \
     2.7 -		fgrep -v $(for i in $(look_for_rwanted) $PACKAGE; do echo " -e $i"; done))
     2.8 +		grep -v $(for i in $(look_for_rwanted) $PACKAGE; do echo " -e ^$i$"; done))
     2.9  	do
    2.10  
    2.11  		# Delay the removing of previous cook depends if they are needed
    2.12 @@ -3029,12 +3029,12 @@
    2.13  
    2.14  					# Auto-install only if we are in a cook chroot.
    2.15  					if [ -x /usr/bin/clean-chroot ]; then
    2.16 +						tazpkg get-install mercurial
    2.17 +					else
    2.18  						echo "" >&2
    2.19  						echo "You need to install mercurial to get wok from hg (recommended). Oherwise, you can switch wok get method to \"tarball\" into $LOCAL_RESOSITORY/tazwok.conf (per-repository configuration, it not always exists) or /etc/slitaz/tazwok.conf (global configuration)." | fold -s >&2
    2.20  						echo "">&2
    2.21  						exit 1
    2.22 -					else
    2.23 -						tazpkg get-install mercurial
    2.24  					fi
    2.25  				fi
    2.26  
     3.1 --- a/web/index.php	Thu Mar 03 22:54:47 2011 +0100
     3.2 +++ b/web/index.php	Fri Mar 04 03:01:03 2011 +0100
     3.3 @@ -12,15 +12,15 @@
     3.4  function include_and_link($file)
     3.5  {
     3.6  	global $log_dir, $version;
     3.7 -	if (($fp = fopen($file,"r")) === false) return;
     3.8 -	while (($pkg = fgets($fp)) !== false) {
     3.9 -		$pkg = chop($pkg);
    3.10 +	if (($str = file_get_contents($file)) === FALSE) return;
    3.11 +	$lines = explode("\n",$str);
    3.12 +	sort($lines);
    3.13 +	foreach ($lines as $pkg) {
    3.14  		if (file_exists("$log_dir/$pkg.html"))
    3.15  			echo "<a href=\"log.php?version=$version&amp;package=".
    3.16  				urlencode($pkg)."\" target=\"_blank\">$pkg</a>\n";
    3.17  		else	echo "$pkg\n";
    3.18  	}
    3.19 -	fclose($fp);
    3.20  }
    3.21  
    3.22  function list_last_cooked($dir, $suffix)