Dpkg::Shlibs::Objdump: fix checks in is_executable() and is_public_library()

diff --git a/ChangeLog b/ChangeLog
index 1bf9e4661fc59c598378c48a1aad46907d802be4..caaab7714f96ff2313a330570d441a1598b1619b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-21  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Shlibs/Objdump.pm: Fix the checks in is_executable() and
+       is_public_library().
+
 2007-11-20  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.14.10~.

diff --git a/debian/changelog b/debian/changelog
index c3f6e5705ac4603f38321eb0350a18aa7ca84883..63e2cdd04638dc01a09fc6321c08fffe9d3d07e2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dpkg (1.14.10) UNRELEASED; urgency=low
 
-  *
+  [ Raphael Hertzog ]
+  * dpkg-shlibdeps now correctly identify private libraries (avoid many
+    warnings with perl/python modules).
 
   [ Updated man pages translations ]
   * Swedish (Peter Karlsson)

diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index 7b3248a291e4a489903b09ed1c1a43a7991b13b8..37f201fe706117901499674f01ea1196421d5697 100644 (file)
--- a/scripts/Dpkg/Shlibs/Objdump.pm
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
@@ -326,13 +326,13 @@ sub get_needed_libraries {
 
 sub is_executable {
     my $self = shift;
-    return exists $self->{flags}{EXEC_P} and $self->{flags}{EXEC_P};
+    return exists $self->{flags}{EXEC_P} && $self->{flags}{EXEC_P});
 }
 
 sub is_public_library {
     my $self = shift;
-    return exists $self->{flags}{DYNAMIC} and $self->{flags}{DYNAMIC}
-       and exists $self->{SONAME} and $self->{SONAME};
+    return exists $self->{flags}{DYNAMIC} && $self->{flags}{DYNAMIC}
+       && exists $self->{SONAME} && $self->{SONAME});
 }
 
 1;