From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Thu, 24 Mar 2016 06:39:52 +0000 (+0200)
Subject: Remove --preserve option
X-Git-Tag: release_1_29~5
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=195a25316cccced5832a749eb5351a715ded4157;p=debian%2Ftar

Remove --preserve option

* src/tar.c: Remove --preserve option
* NEWS: Update.
* doc/tar.texi: Update.
---

diff --git a/NEWS b/NEWS
index 52e3f575..6c0b3bc1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU tar NEWS - User visible changes. 2015-12-06
+GNU tar NEWS - User visible changes. 2016-03-24
 Please send GNU tar bug reports to <bug-tar@gnu.org>
 
 
@@ -48,6 +48,22 @@ NEWID is supplied, NEWNAME must also be either a valid name or a
 +ID.  Otherwise, both NEWNAME and NEWID need not be listed in the
 system user database.
 
+* New option --clamp-mtime
+
+The new --clamp-mtime option changes the behavior of --mtime to only
+use the time specified if the file mtime is newer than the given time.
+The --clamp-mtime option can only be used together with	--mtime.
+
+Typical use case is to make builds reproducible: to loose less
+information, it's better to keep the original date of an archive, 
+except for files modified during the build process. In that case, using
+reference (and thus reproducible) timestamps for the latter is good
+enough.
+
+See <https://wiki.debian.org/ReproducibleBuilds> for more information.
+
+* Deprecated --preserve option removed
+
 * Sparse file detection
 
 Tar now uses SEEK_DATA/SEEK_HOLE on systems that support it.  This
diff --git a/doc/tar.texi b/doc/tar.texi
index e5b920ec..af4d9d8b 100644
--- a/doc/tar.texi
+++ b/doc/tar.texi
@@ -3278,12 +3278,6 @@ Synonym for @option{--format=v7}.
 @item --posix
 Same as @option{--format=posix}.
 
-@opsummary{preserve}
-@item --preserve
-
-Synonymous with specifying both @option{--preserve-permissions} and
-@option{--same-order}.  @xref{Setting Access Permissions}.
-
 @opsummary{preserve-order}
 @item --preserve-order
 
@@ -10146,13 +10140,6 @@ on extracted files.  This option is by default enabled when
 
 
 This option is meaningless with @option{--list} (@option{-t}).
-
-@opindex preserve
-@item --preserve
-Same as both @option{--same-permissions} and @option{--same-order}.
-
-This option is deprecated, and will be removed in @GNUTAR{} version 1.23.
-
 @end table
 
 @node Portability
diff --git a/src/tar.c b/src/tar.c
index cc494bb7..ba24c434 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -319,7 +319,6 @@ enum
   OWNER_MAP_OPTION,
   PAX_OPTION,
   POSIX_OPTION,
-  PRESERVE_OPTION,
   QUOTE_CHARS_OPTION,
   QUOTING_STYLE_OPTION,
   RECORD_SIZE_OPTION,
@@ -542,8 +541,6 @@ static struct argp_option options[] = {
    N_("member arguments are listed in the same order as the "
       "files in the archive"), GRID+1 },
   {"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
-  {"preserve", PRESERVE_OPTION, 0, 0,
-   N_("same as both -p and -s"), GRID+1 },
   {"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0,
    N_("delay setting modification times and permissions of extracted"
       " directories until the end of extraction"), GRID+1 },
@@ -1857,15 +1854,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
       set_archive_format ("posix");
       break;
 
-    case PRESERVE_OPTION:
-      /* FIXME: What it is good for? */
-      optloc_save (OC_SAME_ORDER, args->loc);
-      same_permissions_option = true;
-      same_order_option = true;
-      WARN ((0, 0, _("The --preserve option is deprecated, "
-		     "use --preserve-permissions --preserve-order instead")));
-      break;
-
     case RECORD_SIZE_OPTION:
       {
 	uintmax_t u;