Accepting request 231411 from Base:System

- Only process PO header in msgheadermerge (forwarded request 231392 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/231411
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/translation-update-upstream?expand=0&rev=36

msgheadermerge

@@ -10,8 +10,8 @@ trap "rm -rf {${1%.po},${2%.po}}-msgheadermerge-temp.{merge-dir,order} ${2%.po}-
 RC=0
 
 # Broken pipe is an expected behavior. Redirect stderr to /dev/null.
-msgexec -i $1 $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null
-msgexec -i $2 $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null
+msggrep --force-po $1 | msgexec $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null
+msggrep --force-po $2 | msgexec $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null
 
 # If --swap-plural-forms was used, use plural definition from the other header.
 if test "$6" = --old-plural-forms ; then

translation-update-upstream.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 25 09:58:27 UTC 2014 - schwab@linux-m68k.org
+
+- Only process PO header in msgheadermerge
+
+-------------------------------------------------------------------
+Wed Apr 23 09:22:19 UTC 2014 - dmueller@suse.com
+
+- speed up msgheadermerge by factor 20-25 
+
 -------------------------------------------------------------------
 Wed Mar 13 20:29:06 CET 2013 - sbrabec@suse.cz
 

translation-update-upstream.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package translation-update-upstream
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed