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

fix install_arch_linux_git_deps python2-setuptools is the correct

Browse source 
package

:: python2-setuptools and python2-distribute are in conflict
(setuptools). Remove python2-distribute? [y/N] error: unresolvable
package conflicts detected
error: failed to prepare transaction (conflicting dependencies)

:: python2-setuptools and python2-distribute are in conflict
This commit is contained in:
Niels Abspoel 2013-08-30 23:51:43 +02:00
parent 3573dfa886
commit d3bf09a1f0
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/.project

2
bootstrap-salt.sh
View file

@ -2052,7 +2052,7 @@ install_arch_linux_git_deps() {
install_arch_linux_stable_deps install_arch_linux_stable_deps
pacman -Sy --noconfirm pacman || return 1 pacman -Sy --noconfirm pacman || return 1
pacman -Sy --noconfirm git python2-crypto python2-distribute \ pacman -Sy --noconfirm git python2-crypto python2-setuptools \
python2-jinja python2-m2crypto python2-markupsafe python2-msgpack \ python2-jinja python2-m2crypto python2-markupsafe python2-msgpack \
python2-psutil python2-yaml python2-pyzmq zeromq || return 1 python2-psutil python2-yaml python2-pyzmq zeromq || return 1