[Po4a-commits] "po4a po4a,1.49,1.50 po4a-updatepo,1.38,1.39"
Nicolas FRANCOIS
nekral-guest at alioth.debian.org
Sat Feb 25 22:59:23 UTC 2006
Update of /cvsroot/po4a/po4a
In directory haydn:/tmp/cvs-serv16579
Modified Files:
po4a po4a-updatepo
Log Message:
Additionnal `||' -> `or'.
Also close 354330, which was caused by a wrong usage of rename (and no
warnings were displayed because `||' has an higher priority than `,')
Index: po4a-updatepo
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a-updatepo,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- po4a-updatepo 22 Sep 2005 21:51:49 -0000 1.38
+++ po4a-updatepo 25 Feb 2006 22:59:21 -0000 1.39
@@ -203,15 +203,15 @@
if (-e $po_filename) {
print STDERR wrap_msg(gettext("Updating %s:"), $po_filename)
if $verbose;
- system ("msgmerge","-U",$po_filename,$pot_filename) == 0 ||
- die wrap_msg(gettext("Error while running msgmerge: %s"), $!);
+ system ("msgmerge","-U",$po_filename,$pot_filename) == 0
+ or die wrap_msg(gettext("Error while running msgmerge: %s"), $!);
system "msgfmt --statistics -v -o /dev/null $po_filename"
if $verbose;
} else {
print STDERR wrap_msg(gettext("Creating %s:"), $po_filename)
if $verbose;
- system ("cp",$pot_filename,$po_filename) == 0 ||
- die wrap_msg(gettext("Error while copying the po file: %s"), $!);
+ system ("cp",$pot_filename,$po_filename) == 0
+ or die wrap_msg(gettext("Error while copying the po file: %s"), $!);
}
}
Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- po4a 24 Feb 2006 19:34:15 -0000 1.49
+++ po4a 25 Feb 2006 22:59:20 -0000 1.50
@@ -448,7 +448,7 @@
my ($pot_filename) = "";
my (%po_filename); # po_files: '$lang'=>'$path'
my (%document); # '$master'=> {'format'=>'$format'; '$lang'=>'$path'; 'add_$lang'=>('$path','$path') }
-open CONFIG,"$config_file" || die wrap_msg(gettext("Can't open %s: %s"), $config_file, $!);
+open CONFIG,"$config_file" or die wrap_msg(gettext("Can't open %s: %s"), $config_file, $!);
my ($line,$nb) = ("",0);
while (<CONFIG>) {
$nb++;
@@ -730,8 +730,8 @@
} else {
print wrap_msg(gettext("Creating %s:"), $po_filename{$lang})
if $po4a_opts{"verbose"};
- system ("cp",$pot_filename,$po_filename{$lang}) == 0 ||
- die wrap_msg(gettext("Error while copying the po file: %s"), $!);
+ system ("cp",$pot_filename,$po_filename{$lang}) == 0
+ or die wrap_msg(gettext("Error while copying the po file: %s"), $!);
}
}
More information about the Po4a-commits
mailing list