Просмотр исходного кода

Remove double slash in database path creation

Visible to the user in some error conditions.
Guillem Jover лет назад: 17
Родитель
Сommit
2e7cc3f958
2 измененных файлов с 3 добавлено и 1 удалено
  1. 2 0
      debian/changelog
  2. 1 1
      src/processarc.c

+ 2 - 0
debian/changelog

@@ -28,6 +28,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
     Thanks to Simon Richter <sjr@debian.org>.
     Thanks to Simon Richter <sjr@debian.org>.
   * When aborting due to file conflicts print the version of the conflicted
   * When aborting due to file conflicts print the version of the conflicted
     package. Closes: #540019
     package. Closes: #540019
+  * Remove double slash in database path visible to the user in some error
+    conditions.
 
 
   [ Raphael Hertzog ]
   [ Raphael Hertzog ]
   * Replace install-info by a wrapper around GNU's install-info. The wrapper
   * Replace install-info by a wrapper around GNU's install-info. The wrapper

+ 1 - 1
src/processarc.c

@@ -793,7 +793,7 @@ void process_archive(const char *filename) {
   debug(dbg_general, "process_archive updating info directory");
   debug(dbg_general, "process_archive updating info directory");
   varbufreset(&infofnvb);
   varbufreset(&infofnvb);
   varbufaddstr(&infofnvb,admindir);
   varbufaddstr(&infofnvb,admindir);
-  varbufaddstr(&infofnvb,"/" INFODIR "/");
+  varbufaddstr(&infofnvb, "/" INFODIR);
   infodirlen= infofnvb.used;
   infodirlen= infofnvb.used;
   varbufaddc(&infofnvb,0);
   varbufaddc(&infofnvb,0);
   dsd= opendir(infofnvb.buf);
   dsd= opendir(infofnvb.buf);