Author: glen Date: Tue Oct 5 09:40:19 2010 GMT Module: packages Tag: HEAD ---- Log message: - gawk for strftime - error out even sooner
---- Files affected: packages: pldnotify.awk (1.91 -> 1.92) ---- Diffs: ================================================================ Index: packages/pldnotify.awk diff -u packages/pldnotify.awk:1.91 packages/pldnotify.awk:1.92 --- packages/pldnotify.awk:1.91 Tue Oct 5 11:28:28 2010 +++ packages/pldnotify.awk Tue Oct 5 11:40:14 2010 @@ -1,4 +1,4 @@ -#!/bin/awk -f +#!/usr/bin/gawk -f # $Revision$, $Date$ # # Copyright (C) 2000-2010 PLD-Team <[email protected]> @@ -21,7 +21,9 @@ if (!DEBUG) { return } - print s >> "/dev/stderr" + + print strftime("%Y-%m-%d %H:%M:%S ") s >> "/dev/stderr" +# print s >> "/dev/stderr" } function fixedsub(s1,s2,t, ind) { @@ -256,28 +258,30 @@ errno = system(cmd) d("Execute done") - if (errno==0) { - wholeodp = "" - d("Reading success response...") - while (getline oneline < tmpfile) - wholeodp = (wholeodp " " oneline) -# d("Response: " wholeodp) - } else { + if (errno != 0) { d("Reading failure response...") wholeerr = "" while (getline oneline < tmpfileerr) - wholeerr=(wholeerr " " oneline) + wholeerr = (wholeerr " " oneline) d("Error Response: " wholeerr) - } - - system("rm -f " tmpfile) - system("rm -f " tmpfileerr) - if (errno != 0) { + system("rm -f " tmpfile) + system("rm -f " tmpfileerr) retval = ("WGET ERROR: " errno ": " wholeerr) return retval } + wholeodp = "" + d("Reading success response...") + while (getline oneline < tmpfile) { + wholeodp = (wholeodp " " oneline) +# d("Response: " wholeodp) + } + d("Reponse read done...") + + system("rm -f " tmpfile) + system("rm -f " tmpfileerr) + urldir = url; sub(/[^\/]+$/, "", urldir) @@ -429,9 +433,9 @@ d("and a file: " filename) filenameexp=filename - gsub("\+","\\+",filenameexp) + gsub("[+]","\\+",filenameexp) sub(version,"[A-Za-z0-9.]+",filenameexp) - gsub("\.","\\.",filenameexp) + gsub("[.]","\\.",filenameexp) d("Expression: " filenameexp) match(filename,version) prever=substr(filename,1,RSTART-1) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pldnotify.awk?r1=1.91&r2=1.92&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
