lintian: r560 - in trunk: checks debian

[jeroen@debian.org]

Author: jeroen
Date: 2006-03-03 00:19:43 +0100 (Fri, 03 Mar 2006)
New Revision: 560

Modified:
   trunk/checks/shared-libs
   trunk/debian/changelog
Log:
checks/shared-libs:
+ [JvW] Fix postinst-must-call-ldconfig to also get emitted when there is
  no postinst at all, instead of just one lacking a ldconfig call


Modified: trunk/checks/shared-libs
===================================================================
--- trunk/checks/shared-libs	2006-02-16 16:33:17 UTC (rev 559)
+++ trunk/checks/shared-libs	2006-03-02 23:19:43 UTC (rev 560)
@@ -314,19 +314,21 @@
     }
 }
 
+my $we_call_postinst=0;
 if (-f $postinst) {
     local $_ = slurp_entire_file($postinst);
 
     # Decide if we call ldconfig
     if (/^[^\#]*\bldconfig\b/m) {
-	tag "postinst-has-useless-call-to-ldconfig", ""
-	    unless $must_call_ldconfig;
-    } else {
-	tag "postinst-must-call-ldconfig", "$must_call_ldconfig"
-	    if $must_call_ldconfig;
+	$we_call_postinst=1;
     }
 }
 
+tag "postinst-has-useless-call-to-ldconfig", ""
+    if $we_call_postinst and not $must_call_ldconfig;
+tag "postinst-must-call-ldconfig", "$must_call_ldconfig"
+    if not $we_call_postinst and $must_call_ldconfig;
+
 if (-f $prerm) {
     local $_ = slurp_entire_file($prerm);
     if (/^[^\#]*\bldconfig\b/m) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-16 16:33:17 UTC (rev 559)
+++ trunk/debian/changelog	2006-03-02 23:19:43 UTC (rev 560)
@@ -24,6 +24,9 @@
     + [RA] Make the syntax checking of shell scripts more robust against
       filenames containing shell metacharacters.  Reported by Michael
       Stilkerich.
+  * checks/shared-libs:
+    + [JvW] Fix postinst-must-call-ldconfig to also get emitted when there is
+      no postinst at all, instead of just one lacking a ldconfig call
 
  -- Russ Allbery <rra@debian.org>  Thu,  9 Feb 2006 11:27:55 -0800