From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Tue, 18 Nov 2008 16:02:15 +0000 (+0000)
Subject: If the included files fail, make db-config fail.
X-Git-Tag: MyPLC-4.2-19~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5c61bd05c3236afe260a7119e9edd8232d71c9a5;p=myplc.git

If the included files fail, make db-config fail.
---

diff --git a/db-config b/db-config
index f664044..780bcf2 100755
--- a/db-config
+++ b/db-config
@@ -1038,18 +1038,20 @@ message, please reply so that we may investigate the problem.
                 AddPCUProtocolType(id, ptype)
 
     # Run local db-config snippets
+    files = []
+    dir = "/etc/planetlab/db-config.d"
     try:
-        dir = "/etc/planetlab/db-config.d"
         files = os.listdir(dir)
-        for file in files:
-            if (file.endswith(".bak") or file.endswith("~") or
-                file.endswith(".rpmsave") or file.endswith(".rpmnew") or
-                file.endswith(".orig")):
-                continue
-            execfile(os.path.join(dir, file))
     except:
         pass
 
+    for file in files:
+        if (file.endswith(".bak") or file.endswith("~") or
+            file.endswith(".rpmsave") or file.endswith(".rpmnew") or
+            file.endswith(".orig")):
+            continue
+        execfile(os.path.join(dir, file))
+
 
 if __name__ == '__main__':
     main()