[geany/infrastructure] b054a7: Various cleanups

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sun, 06 Apr 2014 08:35:39 UTC
Commit:      b054a762f517567aaaa6b70255b7fbcbde9ab1d9
             https://github.com/geany/infrastructure/commit/b054a762f517567aaaa6b70255b7fbcbde9ab1d9

Log Message:
-----------
Various cleanups


Modified Paths:
--------------
    scripts/git_hooks/github_commit_mail.py
    scripts/git_hooks/post_commit_hook.py
    scripts/git_hooks/update_repositories.py

Modified: scripts/git_hooks/github_commit_mail.py
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -274,7 +274,7 @@ def main():
     except CommandLineArgumentError, e:
         print >> sys.stderr, e
     except Exception, e:
-        logger.warn(u'An error occurred: %s' % e, exc_info=True)
+        logger.warn(u'An error occurred: %s', unicode(e), exc_info=True)
     logging.shutdown()
 
 


Modified: scripts/git_hooks/post_commit_hook.py
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -59,7 +59,7 @@ def handle_repository_update(repository):
         update_notify = open(update_notify_path, 'w')
         update_notify.write('1')
         update_notify.close()
-        logger.info(u'Not updating repository %s because it is locked, leaving a notify' % repository)
+        logger.warn(u'Not updating repository %s because it is locked, leaving a notify', repository)
     else:
         lock_file = open(lock_file_path, 'w')
         update_repository(repository, repository_path, logger)
@@ -101,7 +101,7 @@ def main():
 try:
     main()
 except Exception, e:
-    logger.warn(u'An error occurred: %s' % e, exc_info=True)
+    logger.warn(u'An error occurred: %s', unicode(e), exc_info=True)
 
 
 print 'Content-type: text/html'


Modified: scripts/git_hooks/update_repositories.py
14 files changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -66,10 +66,10 @@ def main():
         handle_repository_update(repository)
 
 
-logger = setup_logging()
-try:
-    main()
-except Exception, e:
-    logger.warn(u'An error occurred: %s' % e, exc_info=True)
-
-logging.shutdown()
+if __name__ == '__main__':
+    logger = setup_logging()
+    try:
+        main()
+    except Exception, e:
+        logger.warn(u'An error occurred: %s', unicode(e), exc_info=True)
+    logging.shutdown()



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).