The following commit has been merged in the master branch:
commit 7ab25f626b66de6eb6e1deafef4e91727873a621
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Sat May 31 19:46:31 2008 +0200
dpkg-query: strip trailing slashes in parameters after -S or --search
* src/query.c (searchfiles): Trim trailing slashes (and slash dot) in the
arguments of dpkg -S.
diff --git a/ChangeLog b/ChangeLog
index 7e08b10..0f8f9ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-31 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * src/query.c (searchfiles): Trim trailing slashes (and slash dot)
+ in the arguments of dpkg -S.
+
2008-05-24 Guillem Jover <[EMAIL PROTECTED]>
* dpkg-deb/build.c (do_build): Move argument name into a parameter to
diff --git a/debian/changelog b/debian/changelog
index fb8136e..2209642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
include the ELF format of the desired library. Closes: #474671
* dpkg-gensymbols now refuses empty values for the the -v -P and -e
parameters.
+ * dpkg -S now trims trailing slashes in its parameters. Closes: #129577
[ Pierre Habouzit ]
* Add a --query option to update-alternatives. Closes: #336091, #441904
diff --git a/src/query.c b/src/query.c
index dd6d25a..4c74b47 100644
--- a/src/query.c
+++ b/src/query.c
@@ -255,6 +255,7 @@ void searchfiles(const char *const *argv) {
while ((thisarg= *argv++) != 0) {
found= 0;
+ rtrim_slash_slashdot(thisarg);
if (!strchr("*[?/",*thisarg)) {
varbufreset(&vb);
varbufaddc(&vb,'*');
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
