[packages/rpm-build-tools/merge-pld-builder-client: 92/2675] - do not parse escapes with -c

[glen]

commit f293041136ee054c1bdefbaf020ca4c56bfae58b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Jan 19 15:31:10 2010 +0000

    - do not parse escapes with -c
    
    Changed files:
        client/make-request.sh -> 1.63

 make-request.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/make-request.sh b/make-request.sh
index 051e775..13dd189 100644
--- a/make-request.sh
+++ b/make-request.sh
@@ -63,11 +63,12 @@ import sys, urllib2
 
 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 @@ gen_req() {
 
 	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,&,\&,g;s,<,\<,g;s,>,\>,g')</command>"
+		echo "		 <command flags='$command_flags'>$(echo -E "$command" | sed -e 's,&,\&,g;s,<,\<,g;s,>,\>,g')</command>"
 		echo "		 <info></info>"
 		for b in $builders; do
 			echo >&2 "* Builder: $b"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/cca6584b96e6c33d0732d559e43e100d804e2ecd