From d3bf09a1f0866805d727ba2488dedb734fab6b55 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Fri, 30 Aug 2013 23:51:43 +0200 Subject: [PATCH] fix install_arch_linux_git_deps python2-setuptools is the correct 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 --- .gitignore | 1 + bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8fe4fa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.project diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index f61be7e..afcf423 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2052,7 +2052,7 @@ install_arch_linux_git_deps() { install_arch_linux_stable_deps 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-psutil python2-yaml python2-pyzmq zeromq || return 1