[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.7.2
Modestas Vainius
modax at alioth.debian.org
Thu Apr 22 21:18:18 UTC 2010
The following commit has been merged in the master branch:
commit 50e94d39d7bef236285da0324c466ad4eba2bb06
Author: Modestas Vainius <modestas at vainius.eu>
Date: Fri Apr 23 00:09:46 2010 +0300
pkgkde-gensymbols: exclude self when looking for dpkg-gensymbols in PATH.
This should fix endless loop when do()ing system dpkg-gensymbols.
---
debian/changelog | 2 ++
pkgkde-gensymbols | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9d097f2..d006980 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
pkg-kde-tools (0.7.2) UNRELEASED; urgency=low
+ * pkgkde-gensymbols: exclude self when looking for dpkg-gensymbols in PATH.
+ This should fix endless loop when do()ing system dpkg-gensymbols.
-- Modestas Vainius <modax at debian.org> Fri, 23 Apr 2010 00:07:12 +0300
diff --git a/pkgkde-gensymbols b/pkgkde-gensymbols
index fd3768d..35ba4c3 100755
--- a/pkgkde-gensymbols
+++ b/pkgkde-gensymbols
@@ -52,12 +52,13 @@ sub check_dpkg_version {
return $ok;
}
+my $exe = find_exe_in_path("dpkg-gensymbols", $0);
+
if (check_dpkg_version(1, 15, 6)) {
# Export global datalibdir if needed
my $dir = setup_datalibdir(qw(Dpkg/Shlibs/SymbolFile.pm));
if (defined $dir) {
# Finally, run stock dpkg-gensymbols
- my $exe = find_exe_in_path("dpkg-gensymbols");
unless ($exe) {
print STDERR "pkgkde-gensymbols: dpkg-gensymbols could not be found in PATH", "\n";
exit 1;
@@ -78,5 +79,6 @@ if (check_dpkg_version(1, 15, 6)) {
exit 1;
}
} else {
- exec '/usr/bin/dpkg-gensymbols', @ARGV;
+ $exe = '/usr/bin/dpkg-gensymbols' unless $exe;
+ exec $exe, @ARGV;
}
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list