From 58646e3fe098a56eb0c57e7b11bc17987f91a6bc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 28 Sep 2013 11:29:00 +0100 Subject: [PATCH] Don't fail if un-installing python2-distribute threw an error --- bootstrap-salt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 0ef1025..c3e39b0 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2182,7 +2182,8 @@ install_arch_linux_git_deps() { install_arch_linux_stable_deps pacman -Sy --noconfirm pacman || return 1 - pacman -R --noconfirm python2-distribute || return 1 + # Don't fail if un-installing python2-distribute threw an error + pacman -R --noconfirm 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