Imported Debian patch 4.0.5-6~numeezy

install/restart_scripts/restart_dirsrv

@@ -24,10 +24,8 @@ import syslog
 import traceback
 from ipalib import api
 from ipaplatform import services
-from ipaserver.install import certs
 
-
-def _main():
+def main():
     try:
         instance = sys.argv[1]
     except IndexError:
@@ -40,15 +38,9 @@ def _main():
 
     try:
         services.knownservices.dirsrv.restart(instance)
-    except Exception as e:
+    except Exception, e:
         syslog.syslog(syslog.LOG_ERR, "Cannot restart dirsrv (instance: '%s'): %s" % (instance, str(e)))
 
-
-def main():
-    with certs.renewal_lock:
-        _main()
-
-
 try:
     main()
 except Exception: