From: Raphael Hertzog <hertzog@debian.org>
Date: Wed, 21 Nov 2007 08:53:42 +0000 (+0100)
Subject: Dpkg::Shlibs::Objdump: fix checks in is_executable() and is_public_library()
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e8f108687e20e1d37df77ffb639ccf280fe2a42;p=dpkg

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

diff --git a/ChangeLog b/ChangeLog
index 1bf9e466..caaab771 100644
--- 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 c3f6e570..63e2cdd0 100644
--- 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 7b3248a2..37f201fe 100644
--- 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;