projects
/
debian
/
tar
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5304f9b
)
fix add-clamp-mtime.diff to reflect upstream source change
author
Bdale Garbee
<bdale@gag.com>
Sun, 23 Aug 2015 18:23:07 +0000
(20:23 +0200)
committer
Bdale Garbee
<bdale@gag.com>
Sun, 23 Aug 2015 18:23:07 +0000
(20:23 +0200)
debian/patches/add-clamp-mtime.diff
patch
|
blob
|
history
diff --git
a/debian/patches/add-clamp-mtime.diff
b/debian/patches/add-clamp-mtime.diff
index c9d601587bbe6fd9529ce175dd2495f82f6cd2d0..17e752d6986a3cac93bb0a7c79cd5012b916a465 100644
(file)
--- a/
debian/patches/add-clamp-mtime.diff
+++ b/
debian/patches/add-clamp-mtime.diff
@@
-157,14
+157,14
@@
index 4f5017d..cbaa9df 100644
recursion_option = FNM_LEADING_DIR;
unquote_option = true;
tar_sparse_major = 1;
recursion_option = FNM_LEADING_DIR;
unquote_option = true;
tar_sparse_major = 1;
-@@ -24
08,7 +2418
,7 @@ decode_options (int argc, char **argv)
+@@ -24
90,7 +2490
,7 @@ decode_options (int argc, char **argv)
_("Multiple archive files require '-M' option")));
if (listed_incremental_option
- && NEWER_OPTION_INITIALIZED (newer_mtime_option))
+ && TIME_OPTION_INITIALIZED (newer_mtime_option))
_("Multiple archive files require '-M' option")));
if (listed_incremental_option
- && NEWER_OPTION_INITIALIZED (newer_mtime_option))
+ && TIME_OPTION_INITIALIZED (newer_mtime_option))
- USAGE_ERROR ((0, 0,
- _("Cannot combine --listed-incremental with --newer")));
+ option_conflict_error ("--listed-incremental", "--newer");
+
if (incremental_level != -1 && !listed_incremental_option)
@@ -2461,6 +2471,13 @@ decode_options (int argc, char **argv)
USAGE_ERROR ((0, 0, _("Cannot concatenate compressed archives")));
if (incremental_level != -1 && !listed_incremental_option)
@@ -2461,6 +2471,13 @@ decode_options (int argc, char **argv)
USAGE_ERROR ((0, 0, _("Cannot concatenate compressed archives")));