[PATCH 4/7] maint: install: remove support for --preserve_context ("_", not "-")

[Jim Meyering]

From: Jim Meyering <address@hidden>

* src/install.c: Its use has elicited a warning for two years.
Use --preserve-context instead.
* NEWS (changes in behavior): Mention this.
---
 NEWS          |    3 +++
 src/install.c |    8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 9a9b97a..ceccaca 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,9 @@ GNU coreutils NEWS                                    -*- 
outline -*-
   df now aligns columns consistently, and no longer wraps entries
   with longer device identifiers, over two lines.

+  install now rejects its long-deprecated --preserve_context option.
+  Use --preserve-context instead.
+
   test now accepts "==" as a synonym for "="


diff --git a/src/install.c b/src/install.c
index 369547b..dbff9c9 100644
--- a/src/install.c
+++ b/src/install.c
@@ -114,7 +114,6 @@ static char const *strip_program = "strip";
 enum
 {
   PRESERVE_CONTEXT_OPTION = CHAR_MAX + 1,
-  PRESERVE_CONTEXT_OPTION_DEPRECATED,
   STRIP_PROGRAM_OPTION
 };

@@ -130,9 +129,6 @@ static struct option const long_options[] =
   {"owner", required_argument, NULL, 'o'},
   {"preserve-timestamps", no_argument, NULL, 'p'},
   {"preserve-context", no_argument, NULL, PRESERVE_CONTEXT_OPTION},
-  /* --preserve_context was silently supported until Apr 2009.
-     FIXME: disable altogether in a year or so.  */
-  {"preserve_context", no_argument, NULL, PRESERVE_CONTEXT_OPTION_DEPRECATED},
   {"strip", no_argument, NULL, 's'},
   {"strip-program", required_argument, NULL, STRIP_PROGRAM_OPTION},
   {"suffix", required_argument, NULL, 'S'},
@@ -839,10 +835,6 @@ main (int argc, char **argv)
           no_target_directory = true;
           break;

-        case PRESERVE_CONTEXT_OPTION_DEPRECATED:
-          error (0, 0, _("WARNING: --preserve_context is deprecated; "
-                         "use --preserve-context instead"));
-          /* fall through */
         case PRESERVE_CONTEXT_OPTION:
           if ( ! selinux_enabled)
             {
-- 
1.7.5.rc1.228.g86d60b