From: Jim Meyering <meyer...@redhat.com>
* cfg.mk (update-copyright-env): Add UPDATE_COPYRIGHT_FORCE=1
to rejoin some split lines, and UPDATE_COPYRIGHT_USE_INTERVALS=2
to make update-copyright use only one year range.
* gnulib: Update.
* testsuite/files0-from: Adapt to gnulib's change from `q' to 'q'.
---
cfg.mk | 3 ++-
gnulib | 2 +-
testsuite/files0-from | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index e976669..88f92fa 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,7 +29,8 @@ old_NEWS_hash = 7c42fc431cadd9164dde6f9a7113b920
-include $(srcdir)/dist-check.mk
update-copyright-env = \
- UPDATE_COPYRIGHT_USE_INTERVALS=1 \
+ UPDATE_COPYRIGHT_FORCE=1 \
+ UPDATE_COPYRIGHT_USE_INTERVALS=2 \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
_hv_file = $(srcdir)/testsuite/help-version
diff --git a/gnulib b/gnulib
index f51babf..0eab6e2 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit f51babfaf400eb509f854cad509f5e649b9182b1
+Subproject commit 0eab6e2c9ef1e852ec8a880e2e134670f3ceb5c2
diff --git a/testsuite/files0-from b/testsuite/files0-from
index 5458e4f..86d7996 100755
--- a/testsuite/files0-from
+++ b/testsuite/files0-from
@@ -32,14 +32,14 @@ my @Tests =
(
# invalid extra command line argument
['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1},
- {ERR => "$prog: extra operand `no-such'\n"
+ {ERR => "$prog: extra operand 'no-such'\n"
. "file operands cannot be combined with --files0-from\n"
. "Try `$prog --help' for more information.\n"}
],
# missing input file
['missing', '--files0-from=missing', {EXIT=>1},
- {ERR => "$prog: cannot open `missing' for reading: "
+ {ERR => "$prog: cannot open 'missing' for reading: "
. "No such file or directory\n"}],
# empty input, regular file
--
1.7.9.49.g25388
_______________________________________________
bug-idutils mailing list
bug-idutils@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-idutils
