Reorder libgit2 initialization and ssl cert location setting

staticfloat · staticfloat · commit 6c1471ed449f · 2016-10-14T17:12:05.000-07:00
diff --git a/base/libgit2/libgit2.jl b/base/libgit2/libgit2.jl
@@ -535,12 +535,6 @@ function set_ssl_cert_locations(cert_loc)
 end
 
 function __init__()
-    err = ccall((:git_libgit2_init, :libgit2), Cint, ())
-    err > 0 || throw(ErrorException("error initializing LibGit2 module"))
-    atexit() do
-        ccall((:git_libgit2_shutdown, :libgit2), Cint, ())
-    end
-
     # Look for OpenSSL env variable for CA bundle (linux only)
     # windows and macOS use the OS native security backends
     @static if is_linux()
@@ -554,6 +548,12 @@ function __init__()
         end
         set_ssl_cert_locations(cert_loc)
     end
+
+    err = ccall((:git_libgit2_init, :libgit2), Cint, ())
+    err > 0 || throw(ErrorException("error initializing LibGit2 module"))
+    atexit() do
+        ccall((:git_libgit2_shutdown, :libgit2), Cint, ())
+    end
 end
 
 
diff --git a/deps/libgit2.mk b/deps/libgit2.mk
@@ -69,7 +69,6 @@ $(build_datarootdir)/julia/cert.pem:
 else
 $(build_datarootdir)/julia/cert.pem: $(CERTFILE)
 	mkdir -p $(build_datarootdir)/julia
-	echo "NABIL: Copying over certfile $(CERTFILE)"
 	-cp $(CERTFILE) $@
 endif
 
