Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2013-01-03 16:47:14 +05:30
parent 214643208d
commit 34ea3a00a8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup/translations.py
View File

@ -227,10 +227,22 @@ class GetTranslations(Translations): # {{{
ans.append(line.split()[-1]) ans.append(line.split()[-1])
return ans return ans
def resolve_conflicts(self):
conflict = False
for line in subprocess.check_output(['bzr', 'status']).splitlines():
if line == 'conflicts:':
conflict = True
break
if not conflict:
raise Exception('bzr merge failed and no conflicts found')
subprocess.check_call(['bzr', 'resolve', '--take-other'])
def run(self, opts): def run(self, opts):
if not self.modified_translations: if not self.modified_translations:
subprocess.check_call(['bzr', 'merge', self.BRANCH]) try:
subprocess.check_call(['bzr', 'resolve', '--take-other']) subprocess.check_call(['bzr', 'merge', self.BRANCH])
except subprocess.CalledProcessError:
self.resolve_conflicts()
self.check_for_errors() self.check_for_errors()
if self.modified_translations: if self.modified_translations: