pld-builder.new: client/make-request.sh - do not parse escapes with -c

[glen]

Author: glen                         Date: Tue Jan 19 15:31:15 2010 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- do not parse escapes with -c

---- Files affected:
pld-builder.new/client:
   make-request.sh (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: pld-builder.new/client/make-request.sh
diff -u pld-builder.new/client/make-request.sh:1.62 pld-builder.new/client/make-request.sh:1.63
--- pld-builder.new/client/make-request.sh:1.62	Wed Dec 30 10:25:23 2009
+++ pld-builder.new/client/make-request.sh	Tue Jan 19 16:31:10 2010
@@ -63,11 +63,12 @@
 
 try:
         data = sys.stdin.read()
-        req = urllib2.Request(sys.argv[1], data)
+        url = sys.argv[1]
+        req = urllib2.Request(url, data)
         f = urllib2.urlopen(req, timeout = 10)
         f.close()
 except Exception, e:
-        print >> sys.stderr, "Problem while sending request via HTTP: %s" % e
+        print >> sys.stderr, "Problem while sending request via HTTP: %s: %s" % (url, e)
         sys.exit(1)
 print >> sys.stdout, "Request queued via HTTP."
 ' "$url"
@@ -382,9 +383,9 @@
 
 	if [ "$command" != "" ] ; then
 		bid=$(uuidgen)
-		echo >&2 "* Command: $command"
+		echo -E >&2 "* Command: $command"
 		echo "	<batch id='$bid' depends-on=''>"
-		echo "		 <command flags='$command_flags'>$(echo "$command" | sed -e 's,&,\&amp;,g;s,<,\&lt;,g;s,>,\&gt;,g')</command>"
+		echo "		 <command flags='$command_flags'>$(echo -E "$command" | sed -e 's,&,\&amp;,g;s,<,\&lt;,g;s,>,\&gt;,g')</command>"
 		echo "		 <info></info>"
 		for b in $builders; do
 			echo >&2 "* Builder: $b"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/client/make-request.sh?r1=1.62&r2=1.63&f=u