openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fixes DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE matching when empty"

This commit is contained in:
Zuul 2019-08-12 13:22:44 +00:00 committed by Gerrit Code Review
parent 9a145cf0d0 a38ac762f1
commit 4131942356
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if [ ${DIB_DEBUG_TRACE:-0} -gt 1 ]; then if [[ ${DIB_DEBUG_TRACE:-0} -gt 1 ]]; then
set -x set -x
fi fi
set -eu set -eu
@ -8,11 +8,11 @@ set -o pipefail
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-} DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-}
[ -n "$DIB_DISTRIBUTION_MIRROR" ] || exit 0 [[ -n "$DIB_DISTRIBUTION_MIRROR" ]] || exit 0
while IFS= read line while IFS= read line
do do
if [[ "$line" =~ ${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-} ]]; then if [[ -n "${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-}" && "$line" =~ ${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-} ]]; then
# append line unmodified # append line unmodified
echo "$line" | tee --append /etc/apt/sources.list.new echo "$line" | tee --append /etc/apt/sources.list.new
else else