mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Solve openSUSE 12.3 conflict before bootstrapping.
Because `patterns-openSUSE-minimal_base-conflicts` conflicts with `python`, lets remove the first one.
This commit is contained in:
parent
4a7276221a
commit
4163701aaf
1 changed files with 6 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue