The branch, master has been updated
via 261d067696bd54c87108c32957226bf9fbfcf35a (commit)
from 942c4cb368bea1366da7bc86a62b0334193d4204 (commit)
- Shortlog ------------------------------------------------------------
261d067 Dpkg::Shlibs::SymbolFile::merge_symbols() bugfix with deprecated symbols
Summary of changes:
ChangeLog | 6 ++++++
scripts/Dpkg/Shlibs/SymbolFile.pm | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 261d067696bd54c87108c32957226bf9fbfcf35a
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Mon Dec 10 11:06:44 2007 +0100
Dpkg::Shlibs::SymbolFile::merge_symbols() bugfix with deprecated symbols
Do not update the deprecated version of a symbol if it is already marked
deprecated.
diff --git a/ChangeLog b/ChangeLog
index c6d459b..48754cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-10 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Shlibs/SymbolFile.pm (merge_symbols): Do not update
+ the deprecated version of a a symbol if it is already marked
+ deprecated.
+
2007-12-09 Raphael Hertzog <[EMAIL PROTECTED]>
* scripts/Dpkg/Shlibs/SymbolFile.pm (load): Pass the current
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm
b/scripts/Dpkg/Shlibs/SymbolFile.pm
index fcaed80..a2cf9f2 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -232,6 +232,9 @@ sub merge_symbols {
# the symbol was introduced)
foreach my $sym (keys %{$self->{objects}{$soname}{syms}}) {
if (! exists $dynsyms{$sym}) {
+ # Do nothing if already deprecated
+ next if $self->{objects}{$soname}{syms}{$sym}{deprecated};
+
my $info = $self->{objects}{$soname}{syms}{$sym};
if (vercmp($minver, $info->{minver}) > 0) {
$self->{objects}{$soname}{syms}{$sym}{deprecated} = $minver;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
