aboutsummaryrefslogtreecommitdiffstats
path: root/tools/rpm-setup.sh
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2018-06-05 10:31:14 -0400
committerGerald Combs <gerald@wireshark.org>2018-06-05 21:32:29 +0000
commitba3dfd5f4bddaadc74251860c6645fcba418ae3b (patch)
tree5431595f9aff7802adf047c3d9f26b3eef2ac538 /tools/rpm-setup.sh
parentae759a477793b75bde1c562fdbe5ae5295a43f28 (diff)
Fix rpm-setup.sh so it works when you're not installing the optional pkgs.
Looks like this has been broken since Ie46d56aff91694a3b8c4c62b4b03e38d3fb1e68a Change-Id: Idd6cfc3e8d7f66160157eed393e8528ada7786d4 Reviewed-on: https://code.wireshark.org/review/28040 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tools/rpm-setup.sh')
-rwxr-xr-xtools/rpm-setup.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh
index 01450acf9f..2ca06320c3 100755
--- a/tools/rpm-setup.sh
+++ b/tools/rpm-setup.sh
@@ -168,6 +168,8 @@ echo "perl-Pod-Html is unavailable" >&2
add_package ADDITIONAL_LIST asciidoctor || add_package ADDITIONAL_LIST rubygem-asciidoctor.noarch ||
echo "asciidoctor is unavailable" >&2
+ACTUAL_LIST=$BASIC_LIST
+
# Now arrange for optional support libraries
if [ $ADDITIONAL ]
then