aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJuergen Kosel <juergen.kosel@gmx.de>2019-08-01 20:18:04 +0200
committerDario Lombardo <lomato@gmail.com>2019-08-01 19:52:08 +0000
commite7852aa3ba4e14280987a122fb8337ee9b93cde1 (patch)
tree7a17edd6384100ca41505d5eee50eaed89c2a9d5 /tools
parentd286b819b7681e2ff9a514d066d2b228d6567607 (diff)
debian-setup.sh: Correct order of apt-get update and add_package
apt-get update must be called before calling add_package otherwise available packages appear as unavailable. Change-Id: Ie449ca9037950b82908f72a3951401cc0c6496d1 Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de> Reviewed-on: https://code.wireshark.org/review/34162 Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/debian-setup.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh
index cd42fd61ce..589cb7e467 100755
--- a/tools/debian-setup.sh
+++ b/tools/debian-setup.sh
@@ -117,6 +117,10 @@ add_package() {
eval "${list}=\"\${${list}} \${pkgname}\""
}
+# apt-get update must be called before calling add_package
+# otherwise available packages appear as unavailable
+apt-get update || exit 2
+
# cmake3 3.5.1: Ubuntu 14.04
# cmake >= 3.5: Debian >= jessie-backports, Ubuntu >= 16.04
add_package BASIC_LIST cmake3 ||
@@ -180,7 +184,6 @@ then
ACTUAL_LIST="$ACTUAL_LIST $TESTDEPS_LIST"
fi
-apt-get update || exit 2
# shellcheck disable=SC2086
apt-get install $ACTUAL_LIST $OPTIONS || exit 2