The following commit has been merged in the master branch:
commit 2e7cc3f958eefca81c68a74b896279fdd133d981
Author: Guillem Jover <[email protected]>
Date:   Thu Aug 13 21:09:49 2009 +0200

    Remove double slash in database path creation
    
    Visible to the user in some error conditions.

diff --git a/debian/changelog b/debian/changelog
index 2b8a8f9..1205d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
     Thanks to Simon Richter <[email protected]>.
   * When aborting due to file conflicts print the version of the conflicted
     package. Closes: #540019
+  * Remove double slash in database path visible to the user in some error
+    conditions.
 
   [ Raphael Hertzog ]
   * Replace install-info by a wrapper around GNU's install-info. The wrapper
diff --git a/src/processarc.c b/src/processarc.c
index bf5d958..0116f48 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -793,7 +793,7 @@ void process_archive(const char *filename) {
   debug(dbg_general, "process_archive updating info directory");
   varbufreset(&infofnvb);
   varbufaddstr(&infofnvb,admindir);
-  varbufaddstr(&infofnvb,"/" INFODIR "/");
+  varbufaddstr(&infofnvb, "/" INFODIR);
   infodirlen= infofnvb.used;
   varbufaddc(&infofnvb,0);
   dsd= opendir(infofnvb.buf);

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to