Просмотр исходного кода

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

Raphael Hertzog лет назад: 18
Родитель
Сommit
6e8f108687
3 измененных файлов с 11 добавлено и 4 удалено
  1. 5 0
      ChangeLog
  2. 3 1
      debian/changelog
  3. 3 3
      scripts/Dpkg/Shlibs/Objdump.pm

+ 5 - 0
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~.

+ 3 - 1
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)

+ 3 - 3
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;