cookutils rev 618

cooker.cgi: add time zone
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Oct 30 18:48:59 2013 +0100 (2013-10-30)
parents 80cdaf9cfbce
children 61cdcd51454d
files cook web/cooker.cgi
line diff
     1.1 --- a/cook	Thu Sep 26 13:13:21 2013 +0000
     1.2 +++ b/cook	Wed Oct 30 18:48:59 2013 +0100
     1.3 @@ -704,7 +704,8 @@
     1.4  	fi
     1.5  	# ERROR can be echoed any time in cookit()
     1.6  	lerror=$(_n "ERROR")
     1.7 -	if grep -Eq "(^$lerror|undefined reference to)" $LOGS/$pkg.log; then
     1.8 +	if grep -Ev "(conftest|configtest)" $LOGS/$pkg.log | \
     1.9 +	   grep -Eq "(^$lerror|undefined reference to)" ; then
    1.10  		debug_info | tee -a $LOGS/$pkg.log
    1.11  		rm -f $command && exit 1
    1.12  	fi
     2.1 --- a/web/cooker.cgi	Thu Sep 26 13:13:21 2013 +0000
     2.2 +++ b/web/cooker.cgi	Wed Oct 30 18:48:59 2013 +0100
     2.3 @@ -40,7 +40,7 @@
     2.4  
     2.5  # RSS feed generator
     2.6  if [ "$QUERY_STRING" == "rss" ]; then
     2.7 -	pubdate=$(date "+%a, %d %b %Y %X")
     2.8 +	pubdate=$(date "+%a, %d %b %Y %X %Z")
     2.9  	cat << EOT
    2.10  <?xml version="1.0" encoding="utf-8" ?>
    2.11  <rss version="2.0">
    2.12 @@ -48,8 +48,8 @@
    2.13  	<title>SliTaz Cooker</title>
    2.14  	<description>The SliTaz packages cooker feed</description>
    2.15  	<link>$COOKER_URL</link>
    2.16 -	<lastBuildDate>$pubdate GMT</lastBuildDate>
    2.17 -	<pubDate>$pubdate GMT</pubDate>
    2.18 +	<lastBuildDate>$pubdate</lastBuildDate>
    2.19 +	<pubDate>$pubdate</pubDate>
    2.20  EOT
    2.21  	for rss in $(ls -lt $FEEDS/*.xml | head -n 12)
    2.22  	do
    2.23 @@ -331,7 +331,7 @@
    2.24  
    2.25  <p class="info">
    2.26  	Packages: $inwok in the wok - $cooked cooked - $unbuilt unbuilt -
    2.27 -	Server date: $(date '+%Y-%m-%d %H:%M')
    2.28 +	Server date: $(date '+%Y-%m-%d %H:%M %Z')
    2.29  </p>
    2.30  <div class="pctbar">
    2.31  	<div class="pct" style="width: ${pct}%;">${pct}%</div>