From c46b6da65f624d413765733b47e2e287e20be36f Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 28 Jun 2017 17:59:25 +0100 Subject: [PATCH] elements: pip-and-virtualenv: Use common packages for openSUSE The 'packages' variable already contains the packages we need so use it instead of duplicating the packages. Change-Id: Id22e1862f9654e66252d03a0fed9839cf004d750 --- .../install.d/pip-and-virtualenv-source-install/04-install-pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip b/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip index 705c3e1c5..69e64d7a2 100755 --- a/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip +++ b/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip @@ -25,7 +25,7 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel|rhel7) ]]; then # overwrites the pip installed version with the packaged version, # leading to all sorts of weird version issues. if [[ $DISTRO_NAME = opensuse ]]; then - zypper -n install python-virtualenv python-pip python-setuptools + zypper -n install $packages else ${YUM:-yum} install -y $packages fi