From 23d05f16e7684c1a0189e2a787b61715193babd8 Mon Sep 17 00:00:00 2001 From: Michel Blockelet Date: Mon, 8 Mar 2010 10:56:08 +0100 Subject: [PATCH] [gen_confs/generate.py] except UnicodeDecodeError Pour eviter de tout planter quand un argument d'un service est mauvais darcs-hash:20100308095608-ddb99-bf429d9c66267edb3e5c17106d3c7f314a346627.gz --- gestion/gen_confs/generate.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 5cbaae83..b68e1cb2 100644 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -105,7 +105,10 @@ class base_reconfigure: if reste: print "Reste à faire :" for s in reste: - print '\t%s' % s + try: + print '\t%s' % s + except UnicodeDecodeError: + print '\t%s: non imprimable' % s.nom else: print "Plus rien à faire" @@ -347,7 +350,10 @@ remove_lock('auto_generate') if __name__ == '__main__': openlog('generate', LOG_PID) for x in db.services_to_restart(): - syslog(str(x)) + try: + syslog(str(x)) + except UnicodeDecodeError: + syslog("%s: non imprimable" % x.nom) classe = eval(hostname) args_autorises = ['quiet', 'remove=', 'add=', 'list', 'help', 'reconnect'] @@ -385,7 +391,10 @@ if __name__ == '__main__': elif opt == '--list': print 'Services à redémarrer :' for s in db.services_to_restart(): - print '\t%s' % s + try: + print '\t%s' % s + except UnicodeDecodeError: + print '\t%s: non imprimable' % s.nom sys.exit(0) elif opt == '--reconnect':