[Pkg-mono-svn-commits] rev 1024 - mono/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-06-16 12:37:57 -0600 (Wed, 16 Jun 2004)
New Revision: 1024

Modified:
   mono/trunk/debian/dh_netdeps
Log:
Cosmetical, (more) care whether the substvars file was really opened


Modified: mono/trunk/debian/dh_netdeps
===================================================================
--- mono/trunk/debian/dh_netdeps	2004-06-16 18:32:15 UTC (rev 1023)
+++ mono/trunk/debian/dh_netdeps	2004-06-16 18:37:57 UTC (rev 1024)
@@ -57,6 +57,8 @@
 # my $python_major;
 my $mono_version = `$cli -V 2>&1`;
 
+print "fsck, $mono_version\n";
+
 if ( !-x "/usr/bin/monodis" ) {
     error(
 "Package mono-utils is not installed, aborting. (Probably forgot to Build-Depend on mono-utils.)"
@@ -215,17 +217,21 @@
     }
     # now filter the dupes coming from shlibs
     if ( defined( $dh{D_FLAG} ) ) {
-        open( $fh, "<debian/$package.substvars" ) 
-        || warning(
-           "Could not read debian/$package.substvars"
-        );
-        while (<$fh>) {
-            if (/^shlibs:Depends=(.*)\n?/) {
+       if(open( $fh, "<debian/$package.substvars" )) {
+          while (<$fh>) {
+             if (/^shlibs:Depends=(.*)\n?/) {
                 for ( split ( /\s*,\s*/, $1 ) ) {
-                    delete $depkgsFiltered{$_};
+                   delete $depkgsFiltered{$_};
                 }
-            }
-        }
+             }
+          }
+       }
+       else
+       {
+          warning(
+             "Could not read debian/$package.substvars"
+          );
+       }
     }
 
     addsubstvar( $package, "net:Depends",