Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-02-17 09:04:50 +01:00
Code Issues Projects Releases Wiki Activity

...

Browse source
This commit is contained in:
Kovid Goyal 2013-01-03 16:43:07 +05:30
parent a2578335c8
commit 214643208d
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
setup/translations.py
View file

@ -230,6 +230,7 @@ def modified_translations(self):
def run(self, opts):
if not self.modified_translations:
subprocess.check_call(['bzr', 'merge', self.BRANCH])
subprocess.check_call(['bzr', 'resolve', '--take-other'])
self.check_for_errors()
if self.modified_translations: