Imported Debian patch 4.0.5-6~numeezy

install/restart_scripts/restart_httpd

@@ -22,23 +22,15 @@
 import syslog
 import traceback
 from ipaplatform import services
-from ipaserver.install import certs
 
-
-def _main():
+def main():
     syslog.syslog(syslog.LOG_NOTICE, 'certmonger restarted httpd')
 
     try:
         services.knownservices.httpd.restart()
-    except Exception as e:
+    except Exception, e:
         syslog.syslog(syslog.LOG_ERR, "Cannot restart httpd: %s" % str(e))
 
-
-def main():
-    with certs.renewal_lock:
-        _main()
-
-
 try:
     main()
 except Exception: