[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

lintian: r235 - in trunk: checks debian



Author: djpig
Date: 2004-05-01 03:28:54 +0200 (Sat, 01 May 2004)
New Revision: 235

Modified:
   trunk/checks/shared-libs
   trunk/debian/changelog
Log:
The "find a bug a minute after upload" commit:
Don't report shlib-with-executable-bit and
shlib-with-bad-permissions on symbolic links to such files
(there is nothing wrong with the links themself)


Modified: trunk/checks/shared-libs
===================================================================
--- trunk/checks/shared-libs	2004-05-01 01:27:42 UTC (rev 234)
+++ trunk/checks/shared-libs	2004-05-01 01:28:54 UTC (rev 235)
@@ -128,19 +128,23 @@
 	    $real_perm = $perm;
 	} else {
 	    $real_file = abs_path(dirname($cur_file)."/".$link_info{$cur_file});
-	    $real_perm = $files{abs_path(dirname($cur_file)."/".$link_info{$cur_file})} || $perm;
+	    $real_perm = $files{$real_file} || $perm;
 	}
 
-	# executable?
-	if ($real_perm =~ m/x/) {
-	    # yes.  But if the library has an INTERP section, it's designed
-	    # to do something useful when executed, so don't report an error.
-	    printf "E: $pkg $type: shlib-with-executable-bit $cur_file %04o\n",perm2oct($real_perm)
-		unless $INTERP{$real_file};
-	} elsif ($real_perm ne '-rw-r--r--') {
-	    # bad permissions
-	    printf "W: $pkg $type: shlib-with-bad-permissions $cur_file %04o\n",perm2oct($real_perm);
-	}
+        # don't apply the permission checks to links
+        # since this only results in doubled messages
+        if ($cur_file eq $real_file) { 
+            # executable?
+            if ($real_perm =~ m/x/) {
+                # yes.  But if the library has an INTERP section, it's designed
+                # to do something useful when executed, so don't report an error.
+                printf "E: $pkg $type: shlib-with-executable-bit $cur_file %04o\n",perm2oct($real_perm)
+                    unless $INTERP{$real_file};
+            } elsif ($real_perm ne '-rw-r--r--') {
+                # bad permissions
+                printf "W: $pkg $type: shlib-with-bad-permissions $cur_file %04o\n",perm2oct($real_perm);
+            }
+        }
 
 	# installed in a directory controlled by the dynamic linker?
 	if (exists $ldso_dir{dirname($cur_file)}) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-05-01 01:27:42 UTC (rev 234)
+++ trunk/debian/changelog	2004-05-01 01:28:54 UTC (rev 235)
@@ -5,6 +5,9 @@
   * checks/fields{,.desc}:
     + [JvW] Added debian-revision-should-not-be-zero, suggested by Adam
       Conrad
+  * checks/shared-libs:
+    + [FL] Don't report shlib-with-executable-bit and
+      shlib-with-bad-permissions on symbolic links to such files
 
   * testset/filenames:
     + [JvW] Fix two lintian warnings in lintian itself by touching files only



Reply to: