From f894721747fb35a46b77ff726c1d550b2611f575 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 31 Aug 2013 00:26:11 +0100 Subject: [PATCH 1/2] Remove `python2-distribute` before installing `python2-setuptools` --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index afcf423..3a1999c 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2052,6 +2052,7 @@ install_arch_linux_git_deps() { install_arch_linux_stable_deps pacman -Sy --noconfirm pacman || return 1 + pacman -Ry --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 From 7a0267b6d2ec7f72f031f037fb40b8f9fc101a0c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 31 Aug 2013 09:10:52 +0100 Subject: [PATCH 2/2] Removed unsupported option to pacman. --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 3a1999c..926ad37 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 -Ry --noconfirm python2-distribute || 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