diff --git a/ChangeLog b/ChangeLog index d390e1b..07f93e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,12 @@ Version 1.5.9: + * 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.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 9d356c7..e311d40 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 python-elementtree || return 1 + python-pycrypto python-pyzmq python-xml || 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 python-elementtree || return 1 + python-pycrypto python-pyzmq python-pip python-xml || 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 python-elementtree || return 1 + python-pycrypto python-pyzmq python-xml || return 1 fi # PIP based installs need to copy configuration files "by hand".