[xml/sgml-commit] r718 - packages/xml-core/trunk/tools

[Daniel Leidert]

Author: dleidert-guest
Date: 2007-04-14 19:34:00 +0000 (Sat, 14 Apr 2007)
New Revision: 718

Modified:
   packages/xml-core/trunk/tools/update-xmlcatalog
Log:
* tools/update-xmlcatalog: Removed dead code in the type-value evaluation
  (closes: #315759).

Sorry, I introduced a bug with the last change.


Modified: packages/xml-core/trunk/tools/update-xmlcatalog
===================================================================
--- packages/xml-core/trunk/tools/update-xmlcatalog	2007-04-14 19:07:30 UTC (rev 717)
+++ packages/xml-core/trunk/tools/update-xmlcatalog	2007-04-14 19:34:00 UTC (rev 718)
@@ -56,19 +56,19 @@
 catalog file or the local XML catalog file.  A resulting empty XML
 catalog is not automatically deleted from the filesystem.
 
-=item B<--file>
+=item B<--file> I<file>
 
 Indicates a local filename.
 
-=item B<--id>
+=item B<--id> I<id>
 
 Indicates the XML catalog file entry identifier.
 
-=item B<--local>
+=item B<--local> I<local>
 
 Indicates a local XML catalog file.
 
-=item B<--package>
+=item B<--package> I<package>
 
 Indicates a package XML catalog file.
 
@@ -76,7 +76,7 @@
 
 Indicates the root XML catalog file.
 
-=item B<--type>
+=item B<--type> I<type>
 
 Indicates the XML catalog file entry type (public, system, uri).
 
@@ -308,10 +308,13 @@
 }
 
 ## ----------------------------------------------------------------------
-if ( defined( $type ) && $type !~ /^(public|system|uri)$/ )
+if ( defined( $type )
 {
-    print STDERR "$name: error: wrong type\n";
-    exit 1;
+    if ( $type !~ /^(public|system|uri)$/ )
+    {
+        print STDERR "$name: error: wrong type\n";
+        exit 1;
+    }
 }
 else
 {