From e4726ebbdf0457dee866256555e69715216fa7fd Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 21 May 2013 01:58:52 +0100
Subject: [PATCH] Don't fail if only one of the openSUSE repositories failed to
 update.

---
 ChangeLog         | 1 +
 bootstrap-salt.sh | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 38ffc41..47fcc42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Version 1.5.5:
 		* SmartOS no longer ignores $SALT_ETC_DIR. Matthieu Guegan!
 		* FreeBSD no longer ignores $SALT_ETC_DIR. Thanks Geoff Garside!
 		* SunOS (Make use of XPG4 binaries on SunOS). Thanks Matthieu Guegan!
+		* openSUSE (Don't fail if only one of the repositories failed to update)
 
 
 Version 1.5.4:
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 8398097..4a4c567 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2282,7 +2282,13 @@ install_opensuse_stable_deps() {
             http://download.opensuse.org/repositories/devel:/languages:/python/${DISTRO_REPO}/devel:languages:python.repo || return 1
     fi
 
-    zypper --gpg-auto-import-keys --non-interactive refresh || return 1
+    zypper --gpg-auto-import-keys --non-interactive refresh
+    exitcode=$?
+    if [ $? -ne 0 ] && [ $? -ne 4 ]; then
+        # If the exit code is not 0, and it's not 4(failed to update a
+        # repository) return a failure. Otherwise continue.
+        return 1
+    fi
     zypper --non-interactive install --auto-agree-with-licenses libzmq3 python \
         python-Jinja2 python-M2Crypto python-PyYAML python-msgpack-python \
         python-pycrypto python-pyzmq || return 1