Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix logging of git

Browse Source
This commit is contained in:
Michal Čihař 2012-02-28 10:17:43 +01:00
parent a1ba86dcf1
commit 5e1d2b39f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trans/models.py
View File

@ -90,7 +90,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__())
logger.info('updating repo %s', self.__unicode__())
repo.git.remote('update', 'origin')
def configure_branch(self):
@ -115,7 +115,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__())
logger.warning('failed merge on repo %s', self.__unicode__())
def get_translation_blobs(self):
'''