Re: Modes --import and --add-import

[Bruno Haible]

Dmitriy Selyutin wrote:
> I've found an interesting piece of code:
> 
> # 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

Good catch. This code was meant to help people migrate from --import to
--add-import / --update. The change is now over 1 1/2 years ago. No need
for the warning any more. I'm removing it.

> Does that mean that we can now delete this option and use --add-import only?

No, it only means that --import with 0 arguments now really removes all
modules. Like a '--remove-import' with all possible modules as arguments.


2012-05-01  Bruno Haible  <address@hidden>

        gnulib-tool: Remove transitional code.
        * gnulib-tool: Don't warn about --import with 0 arguments any more.
        Reported by Dmitriy Selyutin <address@hidden>.

--- gnulib-tool.orig    Tue May  1 18:00:19 2012
+++ gnulib-tool Tue May  1 17:59:55 2012
@@ -1303,19 +1303,6 @@
       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