[Po4a-commits] "po4a po4a,1.54,1.55"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po4a
In directory haydn:/tmp/cvs-serv18464

Modified Files:
	po4a 
Log Message:
When a master document is specified twice in a configuration file:
  - do not ignore the options specified in the first line;
  - also warn in this case since po4a may not do what the user wants.


Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- po4a	4 Mar 2006 19:32:13 -0000	1.54
+++ po4a	16 Mar 2006 20:16:41 -0000	1.55
@@ -564,8 +564,17 @@
 	@langs = split(/ /,$main." ".$args);
 
     } elsif ($cmd =~ m/type: *(.*)/) {
+	if (defined $document{$main}{'format'}) {
+	    warn wrap_ref_mod("$config_file:$nb", "",
+		gettext("The '%s' master file was specified earlier in the ".
+		        "configuration file.  This may cause problems with ".
+		        "options."), $main)
+		unless ($po4a_opts{"quiet"});
+	}
 	$document{$main}{'format'} = $1;
 	my %options;
+	%options = %{$document{$main}{'options'}}
+	  if defined %{$document{$main}{'options'}};
 	if (defined $aliases{$1}) {
 	    $document{$main}{'format'} = $aliases{$1}{"module"};
 	    if (defined %{$aliases{$1}{"options"}}) {