Report all license incompatibilities during --import.

diff --git a/ChangeLog b/ChangeLog
index d49d1a87dfbad4b88776f4e3684345af07ac53fd..00038fc9d61593f4dd76314b062dd93392338c3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-25  Derek Price  <derek@ximbiot.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Report all license incompatibilities, not
+       just the first one.
+
 2008-09-25  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_import): When computing the edits, consider not

diff --git a/gnulib-tool b/gnulib-tool
index 40527683e82bebe6f0fa3730f2812788de0a719e..977587caa2726aaf21e74c1873b19f1b7fe543a8 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2516,6 +2516,7 @@ func_import ()
 
   # If --lgpl, verify that the licenses of modules are compatible.
   if test -n "$lgpl"; then
+    license_incompatibilities=
     for module in $main_modules; do
       license=`func_get_license $module`
       case $license in
@@ -2526,13 +2527,13 @@ func_import ()
             yes | 3)
               case $license in
                 LGPL | LGPLv2+) ;;
-                *) func_fatal_error "incompatible license on module $module: $license" ;;
+                *) func_append license_incompatibilities "$module $license$nl" ;;
               esac
               ;;
             2)
               case $license in
                 LGPLv2+) ;;
-                *) func_fatal_error "incompatible license on module $module: $license" ;;
+                *) func_append license_incompatibilities "$module $license$nl" ;;
               esac
               ;;
             *) func_fatal_error "invalid value lgpl=$lgpl" ;;
@@ -2540,6 +2541,13 @@ func_import ()
           ;;
       esac
     done
+    if test -n "$license_incompatibilities"; then
+      # Format the license incompatibilities as a table.
+      sed_expand_column1_width50_indent17='s,^\([^ ]*\) ,\1                                                   ,
+s,^\(.................................................[^ ]*\) *,                 \1 ,'
+      license_incompatibilities=`echo "$license_incompatibilities" | sed -e "$sed_expand_column1_width50_indent17"`
+      func_fatal_error "incompatible license on modules:$nl$license_incompatibilities"
+    fi
   fi
 
   # Show banner notice of every module.