X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcertmaster-sync;h=ca7710ed66277dafa12d7cb9631b46e482e51917;hb=beeeed85ec30ca652f95ba8f2c6b4202db905433;hp=4d9559ffe7f06c9693d7ce165b7487c08a209c50;hpb=1b1b6f5733d65cbb73f48ac9b4419aba3dc00eee;p=certmaster.git

diff --git a/scripts/certmaster-sync b/scripts/certmaster-sync
index 4d9559f..ca7710e 100644
--- a/scripts/certmaster-sync
+++ b/scripts/certmaster-sync
@@ -24,9 +24,14 @@ import xmlrpclib
 from glob import glob
 from time import sleep
 from certmaster import certmaster as certmaster
-from func.overlord.client import Client
-from func.CommonErrors import Func_Client_Exception
-import func.jobthing as jobthing
+
+func_import_failure = None
+try:
+    from func.overlord.client import Client
+    from func.CommonErrors import Func_Client_Exception
+    import func.jobthing as jobthing
+except ImportError, e:
+    func_import_failure = str(e)
 
 def syncable(cert_list):
     """
@@ -137,6 +142,11 @@ def main():
     if not cm.cfg.sync_certs and not forced:
         sys.exit(0)
 
+    # Don't complain about func not being available until you actually want it
+    if func_import_failure != None:
+        print >> sys.stderr,  "errors importing func: %s" % func_import_failure
+        sys.exit(1)
+
     certs = glob(os.path.join(cm.cfg.certroot,
                               '*.%s' % cm.cfg.cert_extension))
     hosts = syncable(certs)