manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing variable quoting in proxy handling 

Fixes:
[2021-11-14 11:08:03] lb config noauto --apt-http-proxy http://proxy.example.com:8000
scripts/build/config: 868: local: Acquire::http::Proxy-Auto-Detect: bad variable name
This commit is contained in:
Ryan Finnie 2021-11-14 11:09:44 -08:00
parent 5da4ff53be
commit 7944adc6a5
No known key found for this signature in database
GPG Key ID: 7E60A3A686AE8D98
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions/configuration.sh
View File

@ -860,7 +860,7 @@ Validate_http_proxy ()
Validate_http_proxy_source "command line option --apt-http-proxy" "${LB_APT_HTTP_PROXY}"
# This is the value to use for the the other scripts in live-build
export http_proxy=${LAST_SEEN_PROXY_VALUE}
export http_proxy="${LAST_SEEN_PROXY_VALUE}"
if [ ! -z "${http_proxy}" ]; then
Echo_message "Using http proxy: ${http_proxy}"
fi
@ -869,8 +869,8 @@ Validate_http_proxy ()
# Check whether a proxy setting conflicts with a previously set proxy setting
Validate_http_proxy_source ()
{
local NAME=${1}
local VALUE=${2}
local NAME="${1}"
local VALUE="${2}"
if [ ! -z "${VALUE}" ]; then
if [ ! -z "${LAST_SEEN_PROXY_VALUE}" ]; then
@ -879,7 +879,7 @@ Validate_http_proxy_source ()
exit 1
fi
fi
LAST_SEEN_PROXY_NAME=${NAME}
LAST_SEEN_PROXY_VALUE=${VALUE}
LAST_SEEN_PROXY_NAME="${NAME}"
LAST_SEEN_PROXY_VALUE="${VALUE}"
fi
}