Parcourir la source

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

This reverts commit 7ab25f626b66de6eb6e1deafef4e91727873a621.

Conflicts:

	ChangeLog
	debian/changelog
Guillem Jover il y a 18 ans
Parent
commit
4c93c254e3
3 fichiers modifiés avec 0 ajouts et 7 suppressions
  1. 0 5
      ChangeLog
  2. 0 1
      debian/changelog
  3. 0 1
      src/query.c

+ 0 - 5
ChangeLog

@@ -11,11 +11,6 @@
 	dpkg is unable to create a file so that it also refers to the real
 	dpkg is unable to create a file so that it also refers to the real
 	filename instead of the non-diverted name only.
 	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>
 2008-05-24  Guillem Jover  <guillem@debian.org>
 
 
 	* dpkg-deb/build.c (do_build): Move argument name into a parameter to
 	* dpkg-deb/build.c (do_build): Move argument name into a parameter to

+ 0 - 1
debian/changelog

@@ -16,7 +16,6 @@ dpkg (1.15.0) UNRELEASED; urgency=low
     include the ELF format of the desired library. Closes: #474671
     include the ELF format of the desired library. Closes: #474671
   * dpkg-gensymbols now refuses empty values for the the -v -P and -e
   * dpkg-gensymbols now refuses empty values for the the -v -P and -e
     parameters.
     parameters.
-  * dpkg -S now trims trailing slashes in its parameters. Closes: #129577
   * Update dpkg(1) to refer to conffile whenever we speak of configuration
   * Update dpkg(1) to refer to conffile whenever we speak of configuration
     file handled by dpkg. Thus harmonize vocabulary with the policy. Thanks
     file handled by dpkg. Thus harmonize vocabulary with the policy. Thanks
     to Helge Kreutzmann <debian@helgefjell.de>. Closes: #381219
     to Helge Kreutzmann <debian@helgefjell.de>. Closes: #381219

+ 0 - 1
src/query.c

@@ -255,7 +255,6 @@ void searchfiles(const char *const *argv) {
 
 
   while ((thisarg= *argv++) != 0) {
   while ((thisarg= *argv++) != 0) {
     found= 0;
     found= 0;
-    rtrim_slash_slashdot(thisarg);
     if (!strchr("*[?/",*thisarg)) {
     if (!strchr("*[?/",*thisarg)) {
       varbufreset(&vb);
       varbufreset(&vb);
       varbufaddc(&vb,'*');
       varbufaddc(&vb,'*');