summaryrefslogtreecommitdiffstats
path: root/scripts/oe-git-proxy
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2015-09-18 10:46:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 08:52:55 (GMT)
commit18309f08938cdbe4d1041488feee91507bcc50c1 (patch)
tree3beae25557ea5e4b704eacf494cce2bb06e5206b /scripts/oe-git-proxy
parentc035f3575b2df66f7068d5e73a361ec17a8aec98 (diff)
downloadpoky-18309f08938cdbe4d1041488feee91507bcc50c1.tar.gz
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 <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-git-proxy')
-rwxr-xr-xscripts/oe-git-proxy4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy
index 2473282..b971c88 100755
--- a/scripts/oe-git-proxy
+++ b/scripts/oe-git-proxy
@@ -113,7 +113,9 @@ done
113# Proxy is necessary, determine protocol, server, and port 113# Proxy is necessary, determine protocol, server, and port
114PROTO=$(echo $ALL_PROXY | sed -e 's/\([^:]*\):\/\/.*/\1/') 114PROTO=$(echo $ALL_PROXY | sed -e 's/\([^:]*\):\/\/.*/\1/')
115PROXY=$(echo $ALL_PROXY | sed -e 's/.*:\/\/\([^:]*\).*/\1/') 115PROXY=$(echo $ALL_PROXY | sed -e 's/.*:\/\/\([^:]*\).*/\1/')
116PORT=$(echo $ALL_PROXY | sed -e 's/.*:\([0-9]*\)\/?$/\1/') 116# For backwards compatibility, this allows the port number to be followed by /?
117# in addition to the customary optional /
118PORT=$(echo $ALL_PROXY | sed -e 's/.*:\([0-9]*\)\(\/?\?\)\?$/\1/')
117if [ "$PORT" = "$ALL_PROXY" ]; then 119if [ "$PORT" = "$ALL_PROXY" ]; then
118 PORT="" 120 PORT=""
119fi 121fi