From 6c438fff337794ac168a9b8aa7269b9afff7c95f Mon Sep 17 00:00:00 2001
From: Martin Basti <mbasti@redhat.com>
Date: May 19 2015 12:43:04 +0000
Subject: Server Upgrade: raise RuntimeError instead exit()


Ldapupdater should not call sys.exit() in the middle of execution and
should fail gracefully

https://fedorahosted.org/freeipa/ticket/4904

Reviewed-By: David Kupka <dkupka@redhat.com>

---

diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index 2ea890e..2f5bcc7 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -894,7 +894,7 @@ class LDAPUpdate:
                     data = self.read_file(f)
                 except Exception, e:
                     self.error("error reading update file '%s'", f)
-                    sys.exit(e)
+                    raise RuntimeError(e)
 
                 self.parse_update_file(f, data, all_updates)
                 self._run_updates(all_updates)