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

[SCM] Debian package checker branch, master, updated. 2.5.6-102-g50751b3



The following commit has been merged in the master branch:
commit 50751b3dc1cc85760cd9437b9cf7f90b54db9ccb
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Apr 15 23:30:00 2012 +0200

    c/shared-libs: Remove use of "OTHER_DATA" from objdump-info
    
    OTHER_DATA (previously $objsomething{$file}) is an obsolete way to
    mark a file as an "object file" (incl. SOs).  This is easier too see
    when looking at the "original" checks/shared-libs (i.e. the root
    commit aka. 020888).
    
    One of its use today happens to filter some symlinks from a code path,
    which can just as easily be achieved by checking for:
     $objdump->{$file}->{name}.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/shared-libs b/checks/shared-libs
index 4dfc705..aab7d4f 100644
--- a/checks/shared-libs
+++ b/checks/shared-libs
@@ -149,7 +149,8 @@ for my $cur_file (@{$info->sorted_index}) {
         # executable stack.  We can only warn about a missing section on some
         # architectures.  Only warn if there's an Architecture field; if
         # that's missing, we'll already be complaining elsewhere.
-        if (exists $objdump->{$cur_file}->{OTHER_DATA}) {
+        #  - exists $objdump->{$cur_file}->{name} implies it is an "object" file
+        if (exists $objdump->{$cur_file}->{name}) {
             if (not defined $objdump->{$cur_file}->{STACK}) {
                 if (defined $info->field('architecture')) {
                     my $arch = $info->field('architecture');
@@ -160,8 +161,7 @@ for my $cur_file (@{$info->sorted_index}) {
                 tag 'shlib-with-executable-stack', $cur_file;
             }
         }
-    } elsif (exists $objdump->{$cur_file}->{OTHER_DATA}
-             && $ldconfig_dirs->known(dirname($cur_file))
+    } elsif ($ldconfig_dirs->known(dirname($cur_file))
              && exists $sharedobject{$cur_file}) {
         tag 'sharedobject-in-library-directory-missing-soname', $cur_file;
     } elsif ($cur_file =~ m/\.la$/ and not defined($cur_file_data->{link})) {
diff --git a/lib/Lintian/Collect/Binary.pm b/lib/Lintian/Collect/Binary.pm
index 117f409..623dbed 100644
--- a/lib/Lintian/Collect/Binary.pm
+++ b/lib/Lintian/Collect/Binary.pm
@@ -226,8 +226,6 @@ sub objdump_info {
                 if (defined $file->{STACK} and $file->{STACK} eq '0') {
                     m/\sflags\s+(\S+)/o;
                     $file->{STACK} = $1;
-                } else {
-                    $file->{OTHER_DATA} = 1;
                 }
             }
         }

-- 
Debian package checker


Reply to: