mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-06-24 16:49:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'only-pick-files-from-current-locale' into 'master'

Browse Source 
pick-complete-translations.py: only pick files from current locale

See merge request fdroid/fdroidserver!1827
This commit is contained in:
Hans-Christoph Steiner
2026-05-19 15:26:01 +00:00
parent c411f7b863 9f9616a2b8
commit b0da2280c9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
locale/pick-complete-translations.py
View File

@@ -74,7 +74,16 @@ for locale in active:
reverse=True,
):
print(f'{locale}: git cherry-pick', commit)
repo.git.cherry_pick(commit)
try:
repo.git.cherry_pick(commit)
except git.exc.GitCommandError as e:
for line in repo.git.status(porcelain=True).splitlines():
status, path = line.split()
if status == 'UU':
print('Resetting conflict:', path)
repo.git.reset('--', path)
repo.git.checkout('--', path)
repo.git.cherry_pick('--continue')
with open(manifest_file, 'a') as fp:
for line in manifest_lines: