The following commit has been merged in the master branch:
commit 4c93c254e367b435c95d0b6d5d082d8f14713576
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sun Jun 1 20:23:36 2008 +0300
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 f0bcd2c..896dfe6 100644
--- 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 <[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 1194fdf..d4d43b7 100644
--- 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 <[EMAIL PROTECTED]>. Closes: #381219
diff --git a/src/query.c b/src/query.c
index 4c74b47..dd6d25a 100644
--- 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,'*');
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
