From 4163701aaf4806e3d16716a0f45db6663727eb76 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 22 Aug 2013 19:44:47 +0100 Subject: [PATCH] Solve openSUSE 12.3 conflict before bootstrapping. Because `patterns-openSUSE-minimal_base-conflicts` conflicts with `python`, lets remove the first one. --- bootstrap-salt.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 83ca8c0..06b9a03 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2435,6 +2435,12 @@ install_opensuse_stable_deps() { # repository) return a failure. Otherwise continue. return 1 fi + + if [ $DISTRO_MAJOR_VERSION -eq 12 ] && [ $DISTRO_MINOR_VERSION -eq 3 ]; then + # Because patterns-openSUSE-minimal_base-conflicts conflicts with python, lets remove the first one + zypper --non-interactive remove patterns-openSUSE-minimal_base-conflicts + fi + zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \ python-Jinja2 python-M2Crypto python-PyYAML python-msgpack-python \ python-pycrypto python-pyzmq || return 1