saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Its python-xml not python-elementtree

Browse source
This commit is contained in:
Pedro Algarvio 2013-09-28 22:52:38 +01:00
parent 5da15305f4
commit 876e7416f0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,12 +1,12 @@
Version 1.5.9: 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: Version 1.5.8:
* Fixed an Ubuntu regression. `add-apt-repository` is only available on * Fixed an Ubuntu regression. `add-apt-repository` is only available on
`software-properties-common` after 12.10, inclusive. Thanks Diego Woitasen(diegows) `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: Version 1.5.7:
* For RedHat based distributions which rely on `epel`, the user can now pass `testing` to the * For RedHat based distributions which rely on `epel`, the user can now pass `testing` to the

6
bootstrap-salt.sh
View file

@ -2637,7 +2637,7 @@ install_opensuse_stable_deps() {
zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \ zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \
python-Jinja2 python-M2Crypto python-PyYAML python-msgpack-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 return 0
} }
@ -2767,13 +2767,13 @@ install_suse_11_stable_deps() {
echowarn "PyYaml will be installed using pip" echowarn "PyYaml will be installed using pip"
zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \ zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \
python-Jinja2 'python-M2Crypto>=0.21' python-msgpack-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 # There's no python-PyYaml in SP1, let's install it using pip
pip install PyYaml || return 1 pip install PyYaml || return 1
else else
zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \ zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \
python-Jinja2 'python-M2Crypto>=0.21' python-PyYAML python-msgpack-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 fi
# PIP based installs need to copy configuration files "by hand". # PIP based installs need to copy configuration files "by hand".