[xml/sgml-commit] r717 - in packages/xml-core/trunk: debian tools

[Daniel Leidert]

Author: dleidert-guest
Date: 2007-04-14 19:07:30 +0000 (Sat, 14 Apr 2007)
New Revision: 717

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



Modified: packages/xml-core/trunk/debian/changelog
===================================================================
--- packages/xml-core/trunk/debian/changelog	2007-04-14 17:54:37 UTC (rev 716)
+++ packages/xml-core/trunk/debian/changelog	2007-04-14 19:07:30 UTC (rev 717)
@@ -3,6 +3,8 @@
   * NOT RELEASED YET
 
   [ Daniel Leidert ]
+  * tools/update-xmlcatalog: Removed dead code in the type-value evaluation
+    (closes: #315759).
   * debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields.
     (Uploaders): Added myself.
     (Build-Depends-Indep): Moved debhelper to Build-Depends, where it belongs.
@@ -12,7 +14,7 @@
     oldstable).
   * debhelper/dh_installxmlcatalogs: Fixed typo in dh_installxmlcatalogs
     manpage (closes: #306719). Thanks to A Costa for the report.
-  * debhelper/dh_installxmlcatalogs: Added a small code snippt to add the
+  * debhelper/dh_installxmlcatalogs: Added a small code snippet to add the
     /etc/xml directory to avoid failing installations, if /etc/xml is missing
     (closes: #411770). Thanks to Dmitry Rutsky for the report. The patch is
     based on the the solution used by dh_installcatalogs.

Modified: packages/xml-core/trunk/tools/update-xmlcatalog
===================================================================
--- packages/xml-core/trunk/tools/update-xmlcatalog	2007-04-14 17:54:37 UTC (rev 716)
+++ packages/xml-core/trunk/tools/update-xmlcatalog	2007-04-14 19:07:30 UTC (rev 717)
@@ -308,24 +308,10 @@
 }
 
 ## ----------------------------------------------------------------------
-if ( defined( $type ) )
+if ( defined( $type ) && $type !~ /^(public|system|uri)$/ )
 {
-    if ( defined( $package ) && defined( $file ) )
-    {
-	if ( $type !~ /^(system|uri)$/ )
-	{
-	    print STDERR "$name: error: wrong type\n";
-	    exit 1;
-	}
-    }
-    else
-    {
-	if ( $type !~ /^(public|system|uri)$/ )
-	{
-	    print STDERR "$name: error: wrong type\n";
-	    exit 1;
-	}
-    }
+    print STDERR "$name: error: wrong type\n";
+    exit 1;
 }
 else
 {