diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-04-10 11:26:14 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-04-11 14:32:56 +0200 |
| commit | b80e2c7c258bf8c747ceae4c681ee224a31e9509 (patch) | |
| tree | d13bd9c05dfd24999f62deeb6a796e7ed5b50d2d /src | |
| parent | 9288068ff8f3f749edc54c50f064eca9e6c83019 (diff) | |
| download | coreutils-b80e2c7c258bf8c747ceae4c681ee224a31e9509.tar.xz | |
maint: install: remove support for --preserve_context ("_", not "-")
* src/install.c: Its use has elicited a warning for two years.
Use --preserve-context instead.
* NEWS (changes in behavior): Mention this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/install.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/install.c b/src/install.c index 369547b36..dbff9c94b 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) { |