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

diff --git a/client/make-request.sh b/client/make-request.sh
index aebc5dd..8467bf1 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,9 @@ send_request() {
 		;;
 	*)
 		msg "Sending using HTTP mode to $url"
-		cat - | python -c '
-import sys, socket, urllib2, ssl
+		cat - | python3 -c '
+import sys, socket, ssl
+from urllib import request
 
 try:
     _create_unverified_https_context = ssl._create_unverified_context
@@ -112,16 +113,16 @@ else:
     ssl._create_default_https_context = _create_unverified_https_context
 
 try:
-        data = sys.stdin.read()
+        data = sys.stdin.read().encode("utf-8")
         url = sys.argv[1]
         socket.setdefaulttimeout(30)
-        req = urllib2.Request(url, data)
-        f = urllib2.urlopen(req)
+        req = request.Request(url, data=data)
+        f = request.urlopen(req)
         f.close()
-except Exception, e:
-        print >> sys.stderr, "Problem while sending request via HTTP: %s: %s" % (url, e)
+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 +131,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,36 +540,36 @@ esac
 
 # need to do this after dist selection
 if [ "$skip" ]; then
-	skip=$(skip="$skip" control_url="$control_url" python -c '
-import urllib2
+	skip=$(skip="$skip" control_url="$control_url" python3 -c '
 import sys
-import StringIO
 import gzip
 import re
 import os
 import string
+from urllib import request
+from io import BytesIO
 from xml.dom import minidom
 
 skip = os.environ.get("skip").split(",");
 control_url = os.environ.get("control_url")
 
-print >> sys.stderr, "* Check queue_id-s against %s" % control_url
+print("* Check queue_id-s against %s" % control_url, file=sys.stderr)
 
 try:
 	headers = { "Cache-Control": "no-cache", "Pragma": "no-cache" }
-	req = urllib2.Request(url=control_url + "/queue.gz", headers=headers)
-	f = urllib2.urlopen(req)
-except Exception, e:
-	print >> sys.stderr, "Fetch error %s: %s" % (control_url + "/queue.gz", e)
+	req = request.Request(url=control_url + "/queue.gz", headers=headers)
+	f = request.urlopen(req)
+except Exception as e:
+	print("Fetch error %s: %s" % (control_url + "/queue.gz", e), file=sys.stderr)
 	sys.exit(1)
 
-sio = StringIO.StringIO()
+sio = BytesIO()
 sio.write(f.read())
 f.close()
 sio.seek(0)
 f = gzip.GzipFile(fileobj = sio)
 
-xml = re.compile("(<queue>.*?</queue>)", re.DOTALL).match(f.read()).group(1)
+xml = re.compile("(<queue>.*?</queue>)", re.DOTALL).match(f.read().decode("utf-8")).group(1)
 d = minidom.parseString(xml)
 
 q = []
@@ -580,13 +581,13 @@ for c in d.documentElement.childNodes:
 err = 0
 for s in skip:
 	if s not in q:
-		print >> sys.stderr, "- Check %s: ERROR: Not valid queue-id" % s
+		print("- Check %s: ERROR: Not valid queue-id" % s, file=sys.stderr)
 		err = 1
 	else:
-		print >> sys.stderr, "- Check %s: OK" % s
+		print("- Check %s: OK" % s, file=sys.stderr)
 if err == 1:
 	sys.exit(1)
-print string.join(skip, ",")
+print(",".join(skip))
 ') || exit $?
 	f_upgrade=no
 	build_mode=test
@@ -720,7 +721,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 +788,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"