Author: djpig
Date: 2007-07-14 20:55:48 +0000 (Sat, 14 Jul 2007)
New Revision: 869
Modified:
branches/dpkg-shlibdeps-buxy/scripts/dpkg-gensymbols.pl
branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl
Log:
Misc. code cleanup
Modified: branches/dpkg-shlibdeps-buxy/scripts/dpkg-gensymbols.pl
===================================================================
--- branches/dpkg-shlibdeps-buxy/scripts/dpkg-gensymbols.pl 2007-07-14
16:18:49 UTC (rev 868)
+++ branches/dpkg-shlibdeps-buxy/scripts/dpkg-gensymbols.pl 2007-07-14
20:55:48 UTC (rev 869)
@@ -228,7 +228,7 @@
warning(sprintf(_g("no debian/symbols file used as basis for
generating %s\n"), $output));
}
my ($a, $b) = ($before->filename, $after->filename);
- system("diff -u $a $b") if -x "/usr/bin/diff";
+ system("diff", "-u", $a, $b) if -x "/usr/bin/diff";
}
}
exit($exitcode);
Modified: branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl
===================================================================
--- branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl 2007-07-14
16:18:49 UTC (rev 868)
+++ branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl 2007-07-14
20:55:48 UTC (rev 869)
@@ -95,10 +95,11 @@
print "Scanning $file (for $cur_field field)\n" if $debug;
my $obj = Dpkg::Shlibs::Objdump::Object->new($file);
+ my @sonames = $obj->get_needed_libraries;
# Load symbols files for all needed libraries (identified by SONAME)
my %libfiles;
- foreach my $soname ($obj->get_needed_libraries) {
+ foreach my $soname (@sonames) {
my $file = my_find_library($soname, $obj->{RPATH}, $obj->{format});
warning("Couldn't find library $soname.") unless defined($file);
$libfiles{$file} = $soname if defined($file);
@@ -146,7 +147,6 @@
# Scan all undefined symbols of the binary and resolve to a
# dependency
- my @sonames = $obj->get_needed_libraries;
my %used_sonames = map { $_ => 0 } @sonames;
foreach my $sym ($obj->get_undefined_dynamic_symbols()) {
my $name = $sym->{name};
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
