diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index c2fb4f69..c6c7eed3 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -28,8 +28,6 @@ from syslog import * import platform openlog("generate") -signal.signal(signal.SIGINT, signal.SIG_IGN) # Pas de Ctrl-C - db = crans_ldap() make_lock('auto_generate', 'Big lock', nowait=1) @@ -323,10 +321,10 @@ class gordon(base_reconfigure) : class titanic(base_reconfigure): pass -signal.signal(signal.SIGINT, signal.SIG_DFL) # Comportement normal de Ctrl-C remove_lock('auto_generate') if __name__ == '__main__': + signal.signal(signal.SIGINT, signal.SIG_IGN) # Pas de Ctrl-C openlog('generate', LOG_PID) for x in db.services_to_restart(): try: @@ -418,3 +416,4 @@ if __name__ == '__main__': # On fait ce qu'il y a à faire classe(to_do) + signal.signal(signal.SIGINT, signal.SIG_DFL) # Comportement normal de Ctrl-C diff --git a/wiki/theme/crans.py b/wiki/theme/crans.py index 6bd3e02c..31a6b0cd 100644 --- a/wiki/theme/crans.py +++ b/wiki/theme/crans.py @@ -101,49 +101,6 @@ class Theme(ThemeBase): '{o}': ("{o}", "star_off.png", 16, 16), } - def navibar(self, d): - """ Assemble the navibar - - @param d: parameter dictionary - @rtype: unicode - @return: navibar html - """ - request = self.request - found = {} # pages we found. prevent duplicates - items = [] # navibar items - item = u'