dpkg: support config file overwrite options

function                                             old     new   delta
filter_rename_config                                   -     244    +244
static.dpkg_longopts                                   -     112    +112
dpkg_main                                           3901    3980     +79
unpack_package                                       515     587     +72
append_control_file_to_llist                           -      72     +72
data_extract_all_prefix                               88     116     +28
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 3/0 up/down: 607/0)             Total: 607 bytes

Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 16 insertions, 1 deletions

diff --git a/include/usage.h b/include/usage.h
index 8b026b43a..cf576c666 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -931,13 +931,28 @@
 #define dpkg_full_usage "\n\n" \
        "Install, remove and manage Debian packages\n" \
      "\nOptions:" \
+        IF_LONG_OPTS( \
+     "\n        -i,--install    Install the package" \
+     "\n        -l,--list       List of installed packages" \
+     "\n        --configure     Configure an unpackaged package" \
+     "\n        -P,--purge      Purge all files of a package" \
+     "\n        -r,--remove     Remove all but the configuration files for a package" \
+     "\n        --unpack        Unpack a package, but don't configure it" \
+     "\n        --force-depends Ignore dependency problems" \
+     "\n        --force-confnew Overwrite existing config files when installing" \
+     "\n        --force-confold Keep old config files when installing" \
+        ) \
+        IF_NOT_LONG_OPTS( \
      "\n        -i              Install the package" \
      "\n        -l              List of installed packages" \
      "\n        -C              Configure an unpackaged package" \
-     "\n        -F depends      Ignore dependency problems" \
      "\n        -P              Purge all files of a package" \
      "\n        -r              Remove all but the configuration files for a package" \
      "\n        -u              Unpack a package, but don't configure it" \
+     "\n        -F depends      Ignore dependency problems" \
+     "\n        -F confnew      Overwrite existing config files when installing" \
+     "\n        -F confold      Keep old config files when installing" \
+        )
 
 #define dpkg_deb_trivial_usage \
        "[-cefxX] FILE [argument]"