[xml/sgml-commit] r1258 - in /packages/xml-core/trunk: debian/changelog tools/update-xmlcatalog

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Tue Oct 14 18:32:06 2008
New Revision: 1258

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1258
Log:
* tools/update-xmlcatalog (add_entry). Be more verbose in case an entity is
  already registered.

Modified:
    packages/xml-core/trunk/debian/changelog
    packages/xml-core/trunk/tools/update-xmlcatalog

Modified: packages/xml-core/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/changelog?rev=1258&op=diff
==============================================================================
--- packages/xml-core/trunk/debian/changelog (original)
+++ packages/xml-core/trunk/debian/changelog Tue Oct 14 18:32:06 2008
@@ -6,6 +6,7 @@
   * tools/update-xmlcatalog: Use File::Spec instead of File::Spec::Functions
     for catfile (#482140). Thanks to Agustin Martin Domingo. Fixed pod2man
     errors.
+    (add_entry): Be more verbose in case an entity is already registered.
 
   * Fixed Kurt Roeckx name in the 0.11 changelog entry. Sorry Kurt.
   * debian/compat: Raised to v5.

Modified: packages/xml-core/trunk/tools/update-xmlcatalog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/tools/update-xmlcatalog?rev=1258&op=diff
==============================================================================
--- packages/xml-core/trunk/tools/update-xmlcatalog (original)
+++ packages/xml-core/trunk/tools/update-xmlcatalog Tue Oct 14 18:32:06 2008
@@ -410,7 +410,10 @@
     {
 	if ( $catalog{ $key } ne $entry )
 	{
-	    print STDERR "$name: error: entity already registered\n";
+	    print STDERR "$name: error: entity already registered with a different value\n";
+	    print STDERR " Entity   : [$key]\n";
+	    print STDERR " Old value: [$catalog{$key}]\n";
+	    print STDERR " New value: [$entry]\n";
 	    return;
 	}
 	else
@@ -422,7 +425,7 @@
     }
     else
     {
-	print "$name: adding entity to catalog data $catalog_data\n"
+	print "$name: adding entity to catalog data $catalog_data with the same value\n"
 	    if $verbose;
 	$catalog{ $key } = $entry;
 	return 1;