summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xbuild/i18n-merge-master.pl11
1 files changed, 8 insertions, 3 deletions
diff --git a/build/i18n-merge-master.pl b/build/i18n-merge-master.pl
index d7479efb84..be0474da90 100755
--- a/build/i18n-merge-master.pl
+++ b/build/i18n-merge-master.pl
@@ -7,9 +7,14 @@ if (open F, '-|', 'find', $ARGV[0] || '.', '-type', 'f', '-name', '*.po') {
(my $ref = $path) =~ s/\.po$/\.master.po/;
printf 'Updating %s ', $path;
- system("git show --format=\%B 'master:$path' > '$ref'");
- system('msgmerge', '-N', '-o', $path, $ref, $path);
- system('msgattrib', '--no-obsolete', '-o', $path, $path);
+ my $returnCode = system("git show --format=\%B 'master:$path' > '$ref'");
+ if ( $returnCode == 0 )
+ {
+ system('msgmerge', '-N', '-o', $path, $ref, $path);
+ system('msgattrib', '--no-obsolete', '-o', $path, $path);
+ } else {
+ print "...failed due to git error.\n";
+ }
unlink($ref);
}