From 3a0f424eeb37dc777d52179e20c9889f3350f2ad Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 1 May 2012 18:02:03 +0200 Subject: [PATCH 1/1] gnulib-tool: Remove transitional code. * gnulib-tool: Don't warn about --import with 0 arguments any more. Reported by Dmitriy Selyutin . --- ChangeLog | 6 ++++++ gnulib-tool | 13 ------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58632faee..31f6addd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-05-01 Bruno Haible + gnulib-tool: Remove transitional code. + * gnulib-tool: Don't warn about --import with 0 arguments any more. + Reported by Dmitriy Selyutin . + +2012-05-01 Bruno Haible + getcwd: Fix misindentation. * m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Fix indentation. diff --git a/gnulib-tool b/gnulib-tool index 4adb3b15e..16f9b2f7f 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1303,19 +1303,6 @@ fi func_exit 1 fi fi - # This code helps migrating from --import to --add-import or --update. It can - # be removed on 2012-01-01. - if test "$mode" = import && test $# = 0; then - echo "gnulib-tool: cowardly refusing to erase the module list." 1>&2 - echo "The meaning of the option '--import' has changed." 1>&2 - echo "See the documentation at" 1>&2 - echo "." 1>&2 - echo "For updating to a newer version of gnulib, use" 1>&2 - echo " gnulib-tool --add-import" 1>&2 - echo "For restoring files that were omitted from version control, use" 1>&2 - echo " gnulib-tool --update" 1>&2 - func_exit 1 - fi if test "$mode" = update; then if test $# != 0; then echo "gnulib-tool: too many arguments in 'update' mode" 1>&2 -- 2.11.0