浏览代码

* Added 'D' to the list of choices for conffile handling

Ben Collins 27 年之前
父节点
当前提交
8c1c6de074
共有 3 个文件被更改,包括 6 次插入1 次删除
  1. 4 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 1 1
      main/configure.c

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+Sat Oct 23 21:23:08 EDT 1999 Ben Collins <bcollins.debian.org>
+
+  * Added 'D' to the list of choices for conffile handling
+
 Sat Oct 23 16:25:16 EDT 1999 Ben Collins <bcollins.debian.org>
 Sat Oct 23 16:25:16 EDT 1999 Ben Collins <bcollins.debian.org>
 
 
   * Implemented a nice fix for multiple conflicts and replaces. Also added
   * Implemented a nice fix for multiple conflicts and replaces. Also added

+ 1 - 0
debian/changelog

@@ -26,6 +26,7 @@ dpkg (1.4.1.19) unstable; urgency=low
   * Added armv4l to archtable
   * Added armv4l to archtable
   * Implemented a nice fix for multiple conflicts and replaces. Also added
   * Implemented a nice fix for multiple conflicts and replaces. Also added
     --assert-multi-conrep.
     --assert-multi-conrep.
+  * Added 'D' to the list of choices for conffile handling, closes: #48137
 
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
 

+ 1 - 1
main/configure.c

@@ -286,7 +286,7 @@ void deferred_configure(struct pkginfo *pkg) {
 
 
           s= strrchr(conff->name,'/');
           s= strrchr(conff->name,'/');
           if (!s || !*++s) s= conff->name;
           if (!s || !*++s) s= conff->name;
-          fprintf(stderr, "*** %s (Y/I/N/O/Z) %s ? ",
+          fprintf(stderr, "*** %s (Y/I/N/O/D/Z) %s ? ",
                   s,
                   s,
                   (what & cfof_keep) ? _("[default=N]") :
                   (what & cfof_keep) ? _("[default=N]") :
                   (what & cfof_install) ? _("[default=Y]") : _("[no default]"));
                   (what & cfof_install) ? _("[default=Y]") : _("[no default]"));