Additional makecerts.py fix, don't try generating BKS if JKS fails

1 files changed, 11 insertions, 8 deletions

diff --git a/certs/makecerts.py b/certs/makecerts.py
index c5d5b2fb808..f3f8e4ea5a0 100755
--- a/certs/makecerts.py
+++ b/certs/makecerts.py
@@ -111,19 +111,22 @@ server.save("server.p12").save("server.pem")
 try:
     server.save("server.jks", caalias="cacert")
     client.save("client.jks", caalias="cacert")
+
+    # Don't try to generate the BKS if the JKS generation fails
+    try:
+        server.save("server.bks", caalias="cacert")
+        client.save("client.bks", caalias="cacert")
+    except Exception as ex:
+        for f in ["server.bks", "client.bks"]:
+            if os.path.exists(f): os.remove(f)
+        print("warning: couldn't generate BKS certificates for Android applications:\n" + str(ex))
+        print("Please fix this issue if you want to run the Android tests.")
+
 except Exception as ex:
     for f in ["server.jks", "client.jks"]:
         if os.path.exists(f): os.remove(f)
     print("warning: couldn't generate JKS certificates for Java applications:\n" + str(ex))
     print("Please fix this issue if you want to run the Java tests.")
 
-try:
-    server.save("server.bks", caalias="cacert")
-    client.save("client.bks", caalias="cacert")
-except Exception as ex:
-    for f in ["server.bks", "client.bks"]:
-        if os.path.exists(f): os.remove(f)
-    print("warning: couldn't generate BKS certificates for Android applications:\n" + str(ex))
-    print("Please fix this issue if you want to run the Android tests.")
 
 factory.destroy()