Revert "dpkg-query: strip trailing slashes in parameters after -S or --search"

This reverts commit 7ab25f626b66de6eb6e1deafef4e91727873a621.

Conflicts:

	ChangeLog
	debian/changelog

diff --git a/ChangeLog b/ChangeLog
index f0bcd2c237d2658786d41d223e59cb88ecf05b4f..896dfe63cc926c630d83b6d9044cb7cb5af254cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,11 +11,6 @@
        dpkg is unable to create a file so that it also refers to the real
        filename instead of the non-diverted name only.
 
-2008-05-31  Raphael Hertzog  <hertzog@debian.org>
-
-       * src/query.c (searchfiles): Trim trailing slashes (and slash dot)
-       in the arguments of dpkg -S.
-
 2008-05-24  Guillem Jover  <guillem@debian.org>
 
        * dpkg-deb/build.c (do_build): Move argument name into a parameter to

diff --git a/debian/changelog b/debian/changelog
index 1194fdf266059b5a899da42e6d1c43d633212365..d4d43b7a3ccfdc8174c4d50c0f49da2b326b9b42 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,6 @@ 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
   * Update dpkg(1) to refer to conffile whenever we speak of configuration
     file handled by dpkg. Thus harmonize vocabulary with the policy. Thanks
     to Helge Kreutzmann <debian@helgefjell.de>. Closes: #381219

diff --git a/src/query.c b/src/query.c
index 4c74b47ef559705401886424369258c3e4bd6ec8..dd6d25a0d4c6475fad565bfc49e1ea22d7f5319d 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -255,7 +255,6 @@ void searchfiles(const char *const *argv) {
 
   while ((thisarg= *argv++) != 0) {
     found= 0;
-    rtrim_slash_slashdot(thisarg);
     if (!strchr("*[?/",*thisarg)) {
       varbufreset(&vb);
       varbufaddc(&vb,'*');