[Wesnoth-cvs-commits] wesnoth/utils po2po

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/02/12 14:19:46

Modified files:
        utils          : po2po 

Log message:
        refuse to run po2po if the source was not configured; reinstate 
--use-first in msgcat call to avoid spurious conflicts in header, since I do 
not see what was the problem that caused me to remove it

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/utils/po2po.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: wesnoth/utils/po2po
diff -u wesnoth/utils/po2po:1.6 wesnoth/utils/po2po:1.7
--- wesnoth/utils/po2po:1.6     Sun Oct 31 00:36:51 2004
+++ wesnoth/utils/po2po Sat Feb 12 14:19:45 2005
@@ -14,6 +14,12 @@
 shift
 shift
 
+if ! [ -r po/$DSTDOMAIN/Makefile ]
+then
+    echo "Source not configured in po/$DSTDOMAIN"
+    exit 1
+fi
+
 if [ $# = 0 ]
 then
     set -- `cat po/$SRCDOMAIN/LINGUAS`
@@ -23,7 +29,7 @@
 for LANG in "$@"
 do
     # merge the 2 files
-    msgcat -F po/$DSTDOMAIN/$LANG.po po/$SRCDOMAIN/$LANG.po >$tmp
+    msgcat --use-first -F po/$DSTDOMAIN/$LANG.po po/$SRCDOMAIN/$LANG.po >$tmp
     mv po/$DSTDOMAIN/$LANG.po po/$DSTDOMAIN/$LANG.po.bak
     mv $tmp po/$DSTDOMAIN/$LANG.po