From 67275856662d2acba0e9e4f525d2d84a232dfb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 27 Feb 2012 18:09:00 +0100 Subject: [PATCH] Some logging on git operations --- trans/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trans/models.py b/trans/models.py index 7eba75c98..c80ea195b 100644 --- a/trans/models.py +++ b/trans/models.py @@ -84,6 +84,7 @@ class SubProject(models.Model): if origin.url != self.repo: repo.git.remote('set-url', 'origin', self.repo) # Update + logging.info('updating repo %s', self.__unicode__()) repo.git.remote('update', 'origin') def configure_branch(self): @@ -108,6 +109,7 @@ class SubProject(models.Model): repo.git.merge('origin/%s' % self.branch) except: repo.git.merge('--abort') + logging.warning('failed merge on repo %s', self.__unicode__()) def get_translation_blobs(self): '''