diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-02-07 13:30:46 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-02-07 13:30:46 +0100 |
| commit | 7e328eee3cfddf3a3907965148e0d902295a0c8e (patch) | |
| tree | e386a537f49a19f7f74eca7be1fee1e97e8fa680 | |
| parent | 67573880e699873ed05f8a784cb9937fb1156ed4 (diff) | |
| download | gnulib-7e328eee3cfddf3a3907965148e0d902295a0c8e.tar.gz | |
check-copyright: Don't fail because of the 'glob' module.
Reported by Bjarni Ingi Gislason <bjarniig@simnet.is> in
<https://lists.gnu.org/archive/html/bug-gnulib/2023-02/msg00057.html>.
* check-copyright: Filter out the files from the 'glob' module.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | check-copyright | 18 |
2 files changed, 20 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2023-02-07 Bruno Haible <bruno@clisp.org> + check-copyright: Don't fail because of the 'glob' module. + Reported by Bjarni Ingi Gislason <bjarniig@simnet.is> in + <https://lists.gnu.org/archive/html/bug-gnulib/2023-02/msg00057.html>. + * check-copyright: Filter out the files from the 'glob' module. + +2023-02-07 Bruno Haible <bruno@clisp.org> + check-copyright: Make output prettier. * check-copyright: Resize the second column from width 14 to width 17. diff --git a/check-copyright b/check-copyright index ee173c2595..bfd42fe1f2 100755 --- a/check-copyright +++ b/check-copyright @@ -170,12 +170,20 @@ for file in $candidates; do fi done if test "$file_license" != "$weakest_license"; then - if test $error = 0; then - echo "Module License File License File name" - echo "================= ================= =====================================" + # The 'glob' module is a special case. It contains LGPLv2+ code (shared with + # glibc) but at the same time also has a dependency to a module under GPL + # (namely, 'fstatat'). This is not a mistake. + if test "$weakest_license" = GPL \ + && case "$file" in lib/glob*) true ;; *) false ;; esac; then + : + else + if test $error = 0; then + echo "Module License File License File name" + echo "================= ================= =====================================" + fi + printf '%-17s %-17s %s\n' "$weakest_license" "$file_license" "$file" + error=1 fi - printf '%-17s %-17s %s\n' "$weakest_license" "$file_license" "$file" - error=1 fi done exit $error |