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

Merge pull request #220 from s0undt3ch/develop

Browse source 
Fix Arch distribute VS setuptools conflict
This commit is contained in:
Pedro Algarvio 2013-08-31 01:25:26 -07:00
commit 808944657e
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstrap-salt.sh
View file

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