The following commit has been merged in the master branch:
commit 7f7aa9c4ffbe1fa90f58c5111e52241eb5e64982
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Mon May 5 12:11:10 2008 +0200
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 1537657..5e89a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-05 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-shlibdeps.pl: Include the format of the desired
+ library in the "library not found" error message.
+
2008-05-02 Guillem Jover <[EMAIL PROTECTED]>
* scripts/update-alternatives.pl: Do not suggest manually changing
diff --git a/debian/changelog b/debian/changelog
index c2ac402..426dbd1 100644
--- 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 82a9a01..c86b7a7 100755
--- 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;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
