From 18309f08938cdbe4d1041488feee91507bcc50c1 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 18 Sep 2015 12:46:05 +0200 Subject: 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. (From OE-Core rev: 39eb19e2ae9add58c763b71b54bdb3739041b2d0) Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/oe-git-proxy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/oe-git-proxy') 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 -- cgit v1.2.3-54-g00ecf