gnulib-tool: Remove transitional code.

* gnulib-tool: Don't warn about --import with 0 arguments any more.
Reported by Dmitriy Selyutin <ghostman.sd@gmail.com>.

diff --git a/ChangeLog b/ChangeLog
index 58632fa..31f6add 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-05-01  Bruno Haible  <bruno@clisp.org>
 
+       gnulib-tool: Remove transitional code.
+       * gnulib-tool: Don't warn about --import with 0 arguments any more.
+       Reported by Dmitriy Selyutin <ghostman.sd@gmail.com>.
+
+2012-05-01  Bruno Haible  <bruno@clisp.org>
+
        getcwd: Fix misindentation.
        * m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Fix indentation.
 

diff --git a/gnulib-tool b/gnulib-tool
index 4adb3b1..16f9b2f 100755 (executable)
--- 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 "<http://www.gnu.org/software/gnulib/manual/html_node/Modified-imports.html>." 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