summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-11-14 20:58:09 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-11-15 06:12:51 +0000
commit2b9a2e9981e941873f62f4439ebb94c2be1f43e0 (patch)
tree814587b20cefe6b546ac5280fab0f4dadb777dbd
parentIncluding ca-certificates too when including apt-transport-https. (diff)
downloadsystem-build-2b9a2e9981e941873f62f4439ebb94c2be1f43e0.tar.xz
system-build-2b9a2e9981e941873f62f4439ebb94c2be1f43e0.zip
Correcting https check in archive lists to cover both list and lists.* files.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xscripts/build/bootstrap_debootstrap3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index eded38c98..b95475e13 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -77,7 +77,8 @@ then
fi
# Include apt-transport-https
-if grep -qs '^deb https' config/archives/*.list.*
+if grep -qs '^deb https' config/archives/*.list ||
+ grep -qs '^deb https' config/archives/*.list.*
then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=apt-transport-https,ca-certificates"
fi