dpkg-shlibdeps: improve "library not found" error message

* scripts/dpkg-shlibdeps.pl: Include the format of the desired
library in the "library not found" error message.

diff --git a/ChangeLog b/ChangeLog
index 1537657663e7bdb2a6f1b38871eba5c4849b707a..5e89a6ff3b3488a050e357caab7d9bf8ea2c583d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-05  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/dpkg-shlibdeps.pl: Include the format of the desired
+       library in the "library not found" error message.
+
 2008-05-02  Guillem Jover  <guillem@debian.org>
 
        * scripts/update-alternatives.pl: Do not suggest manually changing

diff --git a/debian/changelog b/debian/changelog
index c2ac402374f10fd9f75341d565c3512d11011d49..426dbd1884511a8fd96ebe34ef88c98b970e1724 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 dpkg (1.15.0) UNRELEASED; urgency=low
 
+  [ Guillem Jover ]
   * Do not suggest manually changing the alternative symlinks on
     update-alternative's verbose mode. Closes: #412487
 
+  [ Raphael Hertzog ]
+  * Enhance dpkg-shlibdeps's error message when a library can't be found to
+    include the ELF format of the desired library. Closes: #474671
+
   [ Updated dpkg translations ]
   * Portuguese (Miguel Figueiredo).
 

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 82a9a0165cc19dd654c6a6cfb0b7b85b5b57a04b..c86b7a755b1ad07c96901243b8d732c3cecb8aa4 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -146,14 +146,14 @@ foreach my $file (keys %exec) {
        unless (defined $lib) {
            $soname_notfound{$soname} = 1;
            $global_soname_notfound{$soname} = 1;
-           my $msg = _g("couldn't find library %s needed by %s (its RPATH is '%s').\n" .
+           my $msg = _g("couldn't find library %s needed by %s (ELF format: '%s'; RPATH: '%s').\n" .
                         "Note: libraries are not searched in other binary packages " .
                         "that do not have any shlibs or symbols file.\nTo help dpkg-shlibdeps " .
                         "find private libraries, you might need to set LD_LIBRARY_PATH.");
            if (scalar(split_soname($soname))) {
-               failure($msg, $soname, $file, join(":", @{$obj->{RPATH}}));
+               failure($msg, $soname, $file, $obj->{format}, join(":", @{$obj->{RPATH}}));
            } else {
-               warning($msg, $soname, $file, join(":", @{$obj->{RPATH}}));
+               warning($msg, $soname, $file, $obj->{format}, join(":", @{$obj->{RPATH}}));
            }
            next;
        }