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

Some logging on git operations

Browse Source
This commit is contained in:
Michal Čihař 2012-02-27 18:09:00 +01:00
parent 74afdf1f3a
commit 6727585666
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trans/models.py
View File

@ -84,6 +84,7 @@ class SubProject(models.Model):
if origin.url != self.repo: if origin.url != self.repo:
repo.git.remote('set-url', 'origin', self.repo) repo.git.remote('set-url', 'origin', self.repo)
# Update # Update
logging.info('updating repo %s', self.__unicode__())
repo.git.remote('update', 'origin') repo.git.remote('update', 'origin')
def configure_branch(self): def configure_branch(self):
@ -108,6 +109,7 @@ class SubProject(models.Model):
repo.git.merge('origin/%s' % self.branch) repo.git.merge('origin/%s' % self.branch)
except: except:
repo.git.merge('--abort') repo.git.merge('--abort')
logging.warning('failed merge on repo %s', self.__unicode__())
def get_translation_blobs(self): def get_translation_blobs(self):
''' '''