X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=client%2Fmake-request.sh;h=fdb750b506a28727301954c3645c9bf1b8eba93f;hb=b06ac0a74084c2ed513ecead310ea47208344d14;hp=aebc5dd2736e13127ae0181e3f49ca075b4e8980;hpb=7b38371253db760e5cd2d518b717b326a8aaf81a;p=tld-builder.git

diff --git a/client/make-request.sh b/client/make-request.sh
index aebc5dd..fdb750b 100755
--- a/client/make-request.sh
+++ b/client/make-request.sh
@@ -21,7 +21,7 @@ pkgrevision=no
 requester_override=
 relup=no
 
-if [ -x /usr/bin/python ]; then
+if [ -x /usr/bin/python3 ]; then
 	send_mode="python"
 else
 	echo "No python present, using mail mode"
@@ -101,8 +101,8 @@ send_request() {
 		;;
 	*)
 		msg "Sending using HTTP mode to $url"
-		cat - | python -c '
-import sys, socket, urllib2, ssl
+		cat - | python3 -c '
+import sys, socket, urllib3, ssl
 
 try:
     _create_unverified_https_context = ssl._create_unverified_context
@@ -115,13 +115,12 @@ try:
         data = sys.stdin.read()
         url = sys.argv[1]
         socket.setdefaulttimeout(30)
-        req = urllib2.Request(url, data)
-        f = urllib2.urlopen(req)
-        f.close()
-except Exception, e:
-        print >> sys.stderr, "Problem while sending request via HTTP: %s: %s" % (url, e)
+        http = urllib3.PoolManager(cert_reqs="CERT_NONE")
+        http.request("POST",url, body=data)
+except Exception as e:
+        print("Problem while sending request via HTTP: %s: %s" % (url, e), file=sys.stderr)
         sys.exit(1)
-print >> sys.stdout, "Request queued via HTTP."
+        print("Request queued via HTTP.", file=sys.stdout)
 ' "$url"
 		;;
 	esac
@@ -130,7 +129,7 @@ print >> sys.stdout, "Request queued via HTTP."
 # htmlspecialchars: escape <, > and &
 hsc() {
 	local input=$1
-	echo -E "$input" | sed -e 's,&,\&amp;,g;s,<,\&lt;,g;s,>,\&gt;,g'
+	printf "%s\n" "$input" | sed -e 's,&,\&amp;,g;s,<,\&lt;,g;s,>,\&gt;,g'
 }
 
 # simple df_fetcher, based on packages/fetchsrc_request
@@ -539,7 +538,7 @@ esac
 
 # need to do this after dist selection
 if [ "$skip" ]; then
-	skip=$(skip="$skip" control_url="$control_url" python -c '
+	skip=$(skip="$skip" control_url="$control_url" python3 -c '
 import urllib2
 import sys
 import StringIO
@@ -720,7 +719,7 @@ gen_req() {
 
 	if [ "$command" ]; then
 		bid=$(uuidgen)
-		echo -E >&2 "* Command: $command"
+		printf "%s\n" "* Command: $command" >&2
 		echo "	<batch id='$bid' depends-on=''>"
 		echo "		 <command flags='$command_flags'>"
 		hsc "$command"
@@ -787,7 +786,7 @@ gen_req() {
 		if [ "$no_depend" = yes ]; then
 			depend=
 		fi
-		echo -E >&2 "* Post-Command: $post_command"
+		printf "%s\n" "* Post-Command: $post_command" >&2
 		echo "	<batch id='$bid' depends-on='$depend'>"
 		echo "		 <command flags='$command_flags'>"
 		hsc "$post_command"