From 9c7c547bc80e10f5da5318d7068f9a881216e257 Mon Sep 17 00:00:00 2001
From: Wes Hayutin <weshayutin@gmail.com>
Date: Thu, 7 Feb 2019 08:55:18 -0700
Subject: [PATCH] use a single bindep config file

The correct way to use bindep is to only
have a single bindep config file.

Change-Id: I0100f41f26cf0c55e95e13de8baa2b3df3758373
---
 bindep.txt         | 38 ++++++++++++++++++++++++++++++++++++++
 bindep_python2.txt | 18 ------------------
 bindep_python3.txt | 17 -----------------
 install-deps.sh    |  4 +---
 4 files changed, 39 insertions(+), 38 deletions(-)
 create mode 100644 bindep.txt
 delete mode 100644 bindep_python2.txt
 delete mode 100644 bindep_python3.txt

diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 000000000..602a59e87
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1,38 @@
+# possible bug in ansible, f29 python 3 env fails
+# w/o both python-libselinux packages installed
+# https://bugs.launchpad.net/tripleo/+bug/1812324
+
+gcc [platform:rpm]
+git [platform:rpm]
+iproute [platform:rpm]
+libyaml [platform:rpm]
+libffi-devel [platform:rpm]
+openssl-devel [platform:rpm]
+# fedora 29
+python3-libselinux [platform:fedora-29]
+python3-netaddr [platform:fedora-29]
+python3-setuptools [platform:fedora-29]
+python3-virtualenv [platform:fedora-29]
+python3-pip [platform:fedora-29]
+# fedora 28
+python2-libselinux [platform:fedora-28]
+python3-libselinux [platform:fedora-28]
+python3-netaddr [platform:fedora-28]
+python3-setuptools [platform:fedora-28]
+python3-virtualenv [platform:fedora-28]
+python3-pip [platform:fedora-28]
+# fedora 27
+python2-libselinux [platform:fedora-27]
+python3-libselinux [platform:fedora-27]
+python2-netaddr [platform:fedora-27]
+python2-setuptools [platform:fedora-27]
+python2-virtualenv [platform:fedora-27]
+python2-pip [platform:fedora-27]
+# centos-7
+libselinux-python [platform:centos-7]
+python-netaddr [platform:centos-7]
+python-setuptools [platform:centos-7]
+python-virtualenv [platform:centos-7]
+python-pip [platform:centos-7]
+#
+redhat-rpm-config [platform:rpm]
diff --git a/bindep_python2.txt b/bindep_python2.txt
deleted file mode 100644
index 5ca82e7df..000000000
--- a/bindep_python2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-gcc
-git
-iproute
-libyaml
-libffi-devel
-openssl-devel
-python2-libselinux [platform:fedora]
-python3-libselinux [platform:fedora]
-python2-netaddr [platform:fedora]
-python2-setuptools [platform:fedora]
-python2-virtualenv [platform:fedora]
-python2-pip [platform:fedora]
-libselinux-python [platform:centos]
-python-netaddr [platform:centos]
-python-setuptools [platform:centos]
-python-virtualenv [platform:centos]
-python-pip [platform:centos]
-redhat-rpm-config
diff --git a/bindep_python3.txt b/bindep_python3.txt
deleted file mode 100644
index 55c53fe6a..000000000
--- a/bindep_python3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# possible bug in ansible, f29 python 3 env fails
-# w/o both python-libselinux packages installed
-# https://bugs.launchpad.net/tripleo/+bug/1812324
-
-gcc
-git
-iproute
-libyaml
-libffi-devel
-openssl-devel
-python2-libselinux [platform:fedora]
-python3-libselinux [platform:fedora]
-python3-netaddr [platform:fedora]
-python3-setuptools [platform:fedora]
-python3-virtualenv [platform:fedora]
-python3-pip [platform:fedora]
-redhat-rpm-config
diff --git a/install-deps.sh b/install-deps.sh
index 4e6b6c3b5..c496773b3 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -198,9 +198,7 @@ install_package_deps_via_bindep(){
     echo "install_package_deps_via_bindep"
     sudo -n true && passwordless_sudo="1" || passwordless_sudo="0"
     if [ "$passwordless_sudo" == "1" ] || [ "$USER_OVERRIDE_SUDO_CHECK" == "1" ]; then
-        for i in `bindep -b -f bindep_$(python_cmd).txt`; do
-            sudo $(package_manager) -y install $i;
-        done
+        bindep -b -f bindep.txt || sudo $(package_manager) -y install `bindep -b -f  bindep.txt`;
     else
         print_sudo_warning
     fi