From 5da15305f42b41fbcba763da0985810f11792825 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 28 Sep 2013 22:26:43 +0100 Subject: [PATCH] For Salt >= 0.17 ElementTree is require and is separate package for openSUSE. --- ChangeLog | 3 +++ bootstrap-salt.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80ff1c1..d390e1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ Version 1.5.9: Version 1.5.8: * Fixed an Ubuntu regression. `add-apt-repository` is only available on `software-properties-common` after 12.10, inclusive. Thanks Diego Woitasen(diegows) + * Distro Support Fixed: + * Salt >= 0.17 requires ElementTree which is on the python standard library after python + 2.6 but openSUSE split that into a separate package. Version 1.5.7: * For RedHat based distributions which rely on `epel`, the user can now pass `testing` to the diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index c3e39b0..9d356c7 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2637,7 +2637,7 @@ install_opensuse_stable_deps() { 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 + python-pycrypto python-pyzmq python-elementtree || return 1 return 0 } @@ -2767,13 +2767,13 @@ install_suse_11_stable_deps() { echowarn "PyYaml will be installed using pip" zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \ python-Jinja2 'python-M2Crypto>=0.21' python-msgpack-python \ - python-pycrypto python-pyzmq python-pip || return 1 + python-pycrypto python-pyzmq python-pip python-elementtree || return 1 # There's no python-PyYaml in SP1, let's install it using pip pip install PyYaml || return 1 else zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \ python-Jinja2 'python-M2Crypto>=0.21' python-PyYAML python-msgpack-python \ - python-pycrypto python-pyzmq || return 1 + python-pycrypto python-pyzmq python-elementtree || return 1 fi # PIP based installs need to copy configuration files "by hand".