From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Fri, 18 Sep 2015 10:46:05 +0000 (+0200)
Subject: oe-git-proxy: Correct the parsing of a port in $ALL_PROXY
X-Git-Tag: 2015-10~373
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=39eb19e2ae9add58c763b71b54bdb3739041b2d0;p=openembedded-core.git

oe-git-proxy: Correct the parsing of a port in $ALL_PROXY

Due to an error in the regular expression used to extract a port
number specified in $ALL_PROXY, rather than allowing the port number
to be followed by an optional "/", the port was required to be
followed by "/?".

This corrects the regular expression to allow an optional "/". It also
allows the odd "/?" suffix for backwards compatibility.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy
index 24732829fb..b971c88ec5 100755
--- a/scripts/oe-git-proxy
+++ b/scripts/oe-git-proxy
@@ -113,7 +113,9 @@ done
 # Proxy is necessary, determine protocol, server, and port
 PROTO=$(echo $ALL_PROXY | sed -e 's/\([^:]*\):\/\/.*/\1/')
 PROXY=$(echo $ALL_PROXY | sed -e 's/.*:\/\/\([^:]*\).*/\1/')
-PORT=$(echo $ALL_PROXY | sed -e 's/.*:\([0-9]*\)\/?$/\1/')
+# For backwards compatibility, this allows the port number to be followed by /?
+# in addition to the customary optional /
+PORT=$(echo $ALL_PROXY | sed -e 's/.*:\([0-9]*\)\(\/?\?\)\?$/\1/')
 if [ "$PORT" = "$ALL_PROXY" ]; then
 	PORT=""
 fi