[Pkg-isocodes-devel] [iso-codes] 01/02: Preserve previous msgids when merging from TP

[Tobias Quathamer]

This is an automated email from the git hooks/post-receive script.

toddy pushed a commit to branch master
in repository iso-codes.

commit 714c8eb6c6e2a2806cfe6147f6701189050f744f
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Mon Apr 11 21:16:10 2016 +0200

    Preserve previous msgids when merging from TP
---
 bin/iso-codes-merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/iso-codes-merge.py b/bin/iso-codes-merge.py
index a5d4db3..a7b2b4e 100755
--- a/bin/iso-codes-merge.py
+++ b/bin/iso-codes-merge.py
@@ -118,7 +118,7 @@ class Isocodes(object):
     def _msgcanonicalformat(self, fname, domain):
         logging.info(fname)
         potfile = os.path.join(self.home, domain, domain+".pot")
-        subprocess.check_call(['msgmerge', '-o', fname, fname, potfile])
+        subprocess.check_call(['msgmerge', '--previous', '-o', fname, fname, potfile])
         subprocess.check_call(['msgattrib', '--no-obsolete', '-o', fname, fname])
         subprocess.check_call(['sed', '-i', '-e', 's/^"Project-Id-Version: iso.*/"Project-Id-Version: ' + domain + '\\\\n"/', fname])
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-isocodes/iso-codes.git