Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package Modules for openSUSE:Factory checked in at 2021-05-12 19:31:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Modules (Old) and /work/SRC/openSUSE:Factory/.Modules.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Modules" Wed May 12 19:31:28 2021 rev:25 rq:891845 version:4.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2021-04-06 17:28:54.895064958 +0200 +++ /work/SRC/openSUSE:Factory/.Modules.new.2988/Modules.changes 2021-05-12 19:31:40.383171616 +0200 @@ -1,0 +2,30 @@ +Thu May 6 15:40:13 UTC 2021 - Philipp Wagner <m...@philipp-wagner.com> + +- Update to upstream version 4.7.1 + * Doc: clarify the license terms used by the project. (fix issue #389) + * Align all files from the Modules project under the GPLv2+ license. + Scripts and libraries that were previously licensed with GPLv3+ have + been moved to GPLv2+ with the consent of their respective copyright + holders. (fix issue #389) + * Revert "Install: have configure script assume the . dot directory + when invoked without the prepended ./" as consent was not obtained + from author to relicense the contribution to GPLv2+. + * Doc: fixes few typos in module(1) and modulefile(4). + * Update the sh-to-mod mechanism to support version 3.2 of the fish + shell. Fish 3.2 introduces the . builtin command that should be + regexp-escaped when determining the shell functions or aliases + defined by the script analyzed by sh-to-mod. + * Vim: update addon files to highlight modulefile variables ModuleTool, + ModuleToolVersion and ModulesCurrentModulefile. + * Doc: update the description and default value of the + --with-dark-background-colors and --with-light-background-colors + installation options. + * Doc: add description of changes that occurred on versions 4.6 and 4.7 + for the --with-dark-background-colors and --with-light-background-colors + installation options and for the MODULES_COLORS environment variable. + * Doc: correct the default value of the --with-tag-abbrev installation + option. + * Doc: add Sticky modules cookbook recipe. +- Correct package license to GPLv2+, matching upstream. + +------------------------------------------------------------------- Old: ---- modules-4.7.0.tar.gz New: ---- modules-4.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Modules.spec ++++++ --- /var/tmp/diff_new_pack.bG6RGj/_old 2021-05-12 19:31:41.103168740 +0200 +++ /var/tmp/diff_new_pack.bG6RGj/_new 2021-05-12 19:31:41.107168724 +0200 @@ -23,10 +23,10 @@ BuildRequires: procps BuildRequires: tcl-devel URL: http://modules.sourceforge.net/ -Version: 4.7.0 +Version: 4.7.1 Release: 0 Summary: Change environment at runtime -License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later +License: GPL-2.0-or-later Group: System/Management Requires: python3 Requires: tcl ++++++ modules-4.7.0.tar.gz -> modules-4.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/ChangeLog new/modules-4.7.1/ChangeLog --- old/modules-4.7.0/ChangeLog 2021-02-19 09:03:43.000000000 +0100 +++ new/modules-4.7.1/ChangeLog 2021-04-06 06:42:47.000000000 +0200 @@ -1,3 +1,134 @@ +2021-04-06 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * NEWS.rst, contrib/rpm/environment-modules.spec.in, doc/source/conf.py, + version.inc.in: Release of version 4.7.1 + +2021-04-05 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * .../sticky-modules/modulefiles/compiler/.modulerc, + .../sticky-modules/modulefiles/compiler/compA/1.0, + .../sticky-modules/modulefiles/compiler/compA/1.2, + .../sticky-modules/modulefiles/compiler/compB/1.3, + .../sticky-modules/modulefiles/compiler/compB/2.1, + .../sticky-modules/modulefiles/core/.modulerc, + doc/example/sticky-modules/modulefiles/core/1.0, + doc/example/sticky-modules/modulefiles/core/2.0, doc/source/conf.py, + doc/source/cookbook/sticky-modules.rst: doc: add *sticky modules* cookbook + recipe + + * doc/source/conf.py: doc: update default etcdir exposed + + * doc/source/cookbook/hide-and-forbid-modules.rst: doc: fix + hide-and-forbid-modules document ref + + * INSTALL.rst: doc: fix --with-tag-abbrev default value in INSTALL Correct + the default value of the --with-tag-abbrev installation option in INSTALL + document. + + * INSTALL.rst, doc/source/module.rst: doc: desc. changes on + MODULES_COLORS/--with-*-background-colors Add description of changes that + occurred on version 4.6 and 4.7 for the --with-dark-background-colors and + --with-light-background-colors installation options and for the + MODULES_COLORS environment variable. + + * INSTALL.rst: doc: fix desc. --with-{dark,light}-background-colors in + INSTALL Update the description and default value of the + --with-dark-background-colors and --with-light-background-colors + installation options in INSTALL document. + +2021-04-04 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * contrib/vim/syntax/modulefile.vim: vim: add modfile vars + Module{Tool,ToolVersion,sCurrentModulefile} + +2021-04-03 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * testsuite/install.00-init/005-init_ts.exp, + testsuite/install.00-init/040-subshell.exp, + testsuite/install.00-init/050-crossshell.exp: ts: exit code on fish>=3.2 + saturates at 255 Update fish install tests following change introduced on + fish 3.2, where the exit code now saturates to 255 for all builtins commands + rather overflowing. (see https://github.com/fish-shell/fish-shell/pull/7702) + + * modulecmd.tcl.in: Fix sh-to-mod to support fish 3.2 Update the sh-to-mod + mechanism to support version 3.2 of the fish shell. This new version + introduces the `.` builtin command that should be regexp-escaped when + determining the shell functions or aliases defined by the script analyzed by + sh-to-mod. An extra space character is also added by fish 3.2 at the end of + shell alias or function definition. Update parsing of these elements to + ignore such extra space. + +2021-03-06 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * .github/ISSUE_TEMPLATE/question.md: github: add question issue template + +2021-03-02 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * configure: install: re-license configure script from GPLv3+ to GPLv2+ + Change license of the configure installation script from GPLv3+ to GPLv2+. + Align this way all files from the Modules project under the GPLv2+ license. + Consent has been obtained from the copyright holders (I, @xdch47 and + @jraphanel) to perform such move. Consent from Jacques Raphanel and Felix + Neum??rker were collected by email. Revert contribution from R.K. Owen + (cc4d3194), from whom consent is not yet obtained. Contribution will be + restored as soon as consent will be obrained. Related to #389 + + * script/envml, script/envml.cmd: script: re-license envml scripts from + GPLv3+ to GPLv2+ Change license of envml and envml.cmd scripts from GPLv3+ + to GPLv2+. Align this way all files from the Modules project under the + GPLv2+ license. Consent has been obtained from the copyright holders (I and + @jraphanel) to perform such move. Consent from Jacques Raphanel was + collected by email. Related to #389 + +2021-02-28 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * doc/source/module.rst, doc/source/modulefile.rst: doc: fixes few typos in + module.1 and modulefile.4 + + * Makefile, README.md: doc: add link to @EnvModules Twitter page in README + + * lib/envmodules.c, lib/envmodules.h: lib: re-license envmodules lib from + GPLv3+ to GPLv2+ Change license of the Modules Tcl extension library from + GPLv3+ to GPLv2+. Align this way all files from the Modules project under + the GPLv2+ license. Consent has been obtained from copyright holder to + perform such move (I hold the full copyright for this library). Related to + #389 + + * lib/testutil-0getgroups.c, lib/testutil-closedir.c, + lib/testutil-dupgetgroups.c, lib/testutil-getgrgid.c, + lib/testutil-getgroups.c, lib/testutil-getpwuid.c, lib/testutil-mktime.c, + lib/testutil-time.c: ts: re-license test libraries from GPLv3+ to GPLv2+ + Change license of all testutil-* libraries, used to test Modules Tcl + extension library, from GPLv3+ to GPLv2+. Align this way all files from the + Modules project under the GPLv2+ license. Consent has been obtained from + copyright holder to perform such move (I hold the full copyright for these + librairies). Related to #389 + + * testsuite/bin/install_test_cmake, testsuite/bin/install_test_csh, + testsuite/bin/install_test_fish, testsuite/bin/install_test_perl, + testsuite/bin/install_test_python, testsuite/bin/install_test_r, + testsuite/bin/install_test_ruby, testsuite/bin/install_test_sh, + testsuite/bin/install_test_tcl: ts: re-license install test scripts from + GPLv3+ to GPLv2+ Change license of all install_test_* scripts, used to test + Modules installation, from GPLv3+ to GPLv2+. Align this way all files from + the Modules project under the GPLv2+ license. Consent has been obtained + from copyright holder to perform such move (I hold the full copyright for + these script files). Related to #389 + + * script/mb, script/mlprof, script/modulecmd.in, script/mpub, script/mrel, + script/mt, script/mtreview, script/nglfar2ccov, script/playdemo: script: + re-license script from GPLv3+ to GPLv2+ Change license of mb, mlprof, + modulecmd, mpub, mrel, mt, mtreview, nglfar2ccov and playdemo scripts from + GPLv3+ to GPLv2+. Align this way all files from the Modules project under + the GPLv2+ license. Consent has been obtained from copyright holder to + perform such move (I hold the full copyright for these script files). + Related to #389 + +2021-02-21 Xavier Delaruelle <xavier.delarue...@cea.fr> + + * README.md, doc/source/index.rst: doc: clarify license terms (GPLv2+) + Related to #389 + 2021-02-19 Xavier Delaruelle <xavier.delarue...@cea.fr> * MIGRATING.rst, NEWS.rst, contrib/rpm/environment-modules.spec.in, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/INSTALL.rst new/modules-4.7.1/INSTALL.rst --- old/modules-4.7.0/INSTALL.rst 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/INSTALL.rst 2021-04-06 06:39:50.000000000 +0200 @@ -625,30 +625,59 @@ ``dark``. SGRLIST follows the same syntax than used in ``LS_COLORS``. Each element in SGRLIST is an output item associated to a Select Graphic Rendition (SGR) code. Elements in SGRLIST are separated by ``:``. Output items are - designated by keys. Items able to be colorized are: highlighted element - (``hi``), debug information (``db``), trace information (``tr``) tag - separator (``se``); Error (``er``), warning (``wa``), module error (``me``) - and info (``in``) message prefixes; Modulepath (``mp``), directory (``di``), - module alias (``al``), module symbolic version (``sy``) and module - ``default`` version (``de``). For a complete SGR code reference, see + designated by keys. + + Items able to be colorized are: highlighted element (``hi``), debug + information (``db``), trace information (``tr``) tag separator (``se``); + Error (``er``), warning (``wa``), module error (``me``) and info (``in``) + message prefixes; Modulepath (``mp``), directory (``di``), module alias + (``al``), module symbolic version (``sy``) and module ``default`` version + (``de``). + + :ref:`Module tags` can also be colorized. The key to set in the color palette + to get a graphical rendering of a tag is the tag name or the tag abbreviation + if one is defined for tag. The SGR code applied to a tag name is ignored if + an abbreviation is set for this tag thus the SGR code should be defined for + this abbreviation to get a graphical rendering. Each basic tag has by default + a key set in the color palette, based on its abbreviated string: auto-loaded + (``aL``), forbidden (``F``), hidden and hidden-loaded (``H``), loaded + (``L``), nearly-forbidden (``nF``), sticky (``S``) and super-sticky (``sS``). + + For a complete SGR code reference, see https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters. - (default=\ ``hi=1:db=2:tr=2:se=2:er=91:wa=93:me=95:in=94:mp=1;94:di=94:al=96:sy=95:de=4:cm=92``) + (default=\ ``hi=1:db=2:tr=2:se=2:er=91:wa=93:me=95:in=94:mp=1;94:di=94:al=96:sy=95:de=4:cm=92:aL=100:L=90;47:H=2:F=41:nF=43:S=46:sS=44``) .. only:: html .. versionadded:: 4.3 + .. versionchanged:: 4.6 + Output item for trace information (``tr``) added + + .. versionchanged:: 4.7 + Output items for module tags auto-loaded (``aL``), forbidden (``F``), + hidden and hidden-loaded (``H``), loaded (``L``), nearly-forbidden + (``nF``), sticky (``S``) and super-sticky (``sS``) added + .. instopt:: --with-light-background-colors=SGRLIST Default color set to apply if terminal background color is defined to ``light``. Expect the same syntax than described for :instopt:`--with-dark-background-colors`. - (default=\ ``hi=1:db=2:tr=2:se=2:er=31:wa=33:me=35:in=34:mp=1;34:di=34:al=36:sy=35:de=4:cm=32``) + (default=\ ``hi=1:db=2:tr=2:se=2:er=31:wa=33:me=35:in=34:mp=1;34:di=34:al=36:sy=35:de=4:cm=32:aL=107:L=47:H=2:F=101:nF=103:S=106:sS=104``) .. only:: html .. versionadded:: 4.3 + .. versionchanged:: 4.6 + Output item for trace information (``tr``) added + + .. versionchanged:: 4.7 + Output items for module tags auto-loaded (``aL``), forbidden (``F``), + hidden and hidden-loaded (``H``), loaded (``L``), nearly-forbidden + (``nF``), sticky (``S``) and super-sticky (``sS``) added + .. instopt:: --with-terminal-background=VALUE The terminal background color that determines the color set to apply by @@ -718,7 +747,7 @@ Define the abbreviation to use when reporting each module tag. Each element in ABBRVLIST is a tag name associated to an abbreviation string (elements in ABBRVLIST are separated by ``:``). - (default=\ ``auto-loaded=aL:loaded=L:hidden=H:forbidden=F:nearly-forbidden=nF``) + (default=\ ``auto-loaded=aL:loaded=L:hidden=H:hidden-loaded=H:forbidden=F:nearly-forbidden=nF:sticky=S:super-sticky=sS``) .. only:: html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/Makefile new/modules-4.7.1/Makefile --- old/modules-4.7.0/Makefile 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/Makefile 2021-04-06 06:39:50.000000000 +0200 @@ -369,7 +369,7 @@ README: $(ECHO_GEN) - sed -e '1,9d' $@.md > $@ + sed -e '1,10d' $@.md > $@ script/add.modules: script/add.modules.in $(translate-in-script) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/NEWS.rst new/modules-4.7.1/NEWS.rst --- old/modules-4.7.0/NEWS.rst 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/NEWS.rst 2021-04-06 06:39:50.000000000 +0200 @@ -8,6 +8,37 @@ .. _4.7 release notes: +Modules 4.7.1 (2021-04-06) +-------------------------- + +* Doc: clarify the license terms used by the project. (fix issue #389) +* Align all files from the Modules project under the GPLv2+ license. Scripts + and libraries that were previously licensed with GPLv3+ have been moved to + GPLv2+ with the consent of their respective copyright holders. (fix issue + #389) +* Revert "Install: have :file:`configure` script assume the ``.`` dot + directory when invoked without the prepended ``./``" as consent was not + obtained from author to relicense the contribution to GPLv2+. +* Doc: fixes few typos in :ref:`module(1)` and :ref:`modulefile(4)`. +* Update the :subcmd:`sh-to-mod` mechanism to support version 3.2 of the fish + shell. Fish 3.2 introduces the ``.`` builtin command that should be + regexp-escaped when determining the shell functions or aliases defined by + the script analyzed by :subcmd:`sh-to-mod`. +* Vim: update addon files to highlight modulefile variables + :mfvar:`ModuleTool`, :mfvar:`ModuleToolVersion` and + :mfvar:`ModulesCurrentModulefile`. +* Doc: update the description and default value of the + :instopt:`--with-dark-background-colors` and + :instopt:`--with-light-background-colors` installation options. +* Doc: add description of changes that occurred on versions 4.6 and 4.7 for + the :instopt:`--with-dark-background-colors` and + :instopt:`--with-light-background-colors` installation options and for the + :envvar:`MODULES_COLORS` environment variable. +* Doc: correct the default value of the :instopt:`--with-tag-abbrev` + installation option. +* Doc: add :ref:`sticky-modules-rcp` cookbook recipe. + + Modules 4.7.0 (2021-02-19) -------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/README.md new/modules-4.7.1/README.md --- old/modules-4.7.0/README.md 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/README.md 2021-04-06 06:39:50.000000000 +0200 @@ -6,6 +6,7 @@ [](https://codecov.io/gh/cea-hpc/modules) [](https://modules.readthedocs.io/en/latest/?badge=latest) [](https://repology.org/metapackage/environment-modules/versions) +[](https://twitter.com/EnvModules) Modules, provides dynamic modification of a user's environment ============================================================== @@ -85,8 +86,9 @@ License ------- -Modules is distributed under the GNU General Public License version 2 (GPL -v2). Read the file `COPYING.GPLv2` for details. +Modules is distributed under the GNU General Public License, either version 2 +or (at your option) any later version (GPL v2+). Read the file `COPYING.GPLv2` +for details. Documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/configure new/modules-4.7.1/configure --- old/modules-4.7.0/configure 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/configure 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env bash # # CONFIGURE, check requirements then set variables and create Makefiles -# Copyright (C) 2017-2020 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -20,7 +20,6 @@ progpath=$0 progdir=${progpath%/*} -[ -d $progdir ] || progdir=. prog=${progpath##*/} # files to translate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/contrib/rpm/environment-modules.spec new/modules-4.7.1/contrib/rpm/environment-modules.spec --- old/modules-4.7.0/contrib/rpm/environment-modules.spec 2021-02-19 09:03:43.000000000 +0100 +++ new/modules-4.7.1/contrib/rpm/environment-modules.spec 2021-04-06 06:42:47.000000000 +0200 @@ -2,13 +2,13 @@ %global vimdatadir %{_datadir}/vim/vimfiles Name: environment-modules -Version: 4.7.0 +Version: 4.7.1 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment License: GPLv2+ URL: http://modules.sourceforge.net/ -Source0: http://downloads.sourceforge.net/modules/modules-4.7.0.tar.bz2 +Source0: http://downloads.sourceforge.net/modules/modules-4.7.1.tar.bz2 BuildRequires: tcl BuildRequires: dejagnu @@ -94,7 +94,7 @@ %prep -%setup -q -n modules-4.7.0 +%setup -q -n modules-4.7.1 %build @@ -258,6 +258,9 @@ %changelog +* Tue Apr 6 2021 Xavier Delaruelle <xavier.delarue...@cea.fr> - 4.7.1-1 +- Update to 4.7.1 + * Fri Feb 19 2021 Xavier Delaruelle <xavier.delarue...@cea.fr> - 4.7.0-1 - Update to 4.7.0 - Remove obsolete 'Group' tag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/contrib/rpm/environment-modules.spec.in new/modules-4.7.1/contrib/rpm/environment-modules.spec.in --- old/modules-4.7.0/contrib/rpm/environment-modules.spec.in 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/contrib/rpm/environment-modules.spec.in 2021-04-06 06:39:50.000000000 +0200 @@ -2,7 +2,7 @@ %global vimdatadir %{_datadir}/vim/vimfiles Name: environment-modules -Version: 4.7.0 +Version: 4.7.1 Release: @MODULES_RPM_RELEASE@%{?dist} Summary: Provides dynamic modification of a user's environment @@ -258,6 +258,9 @@ %changelog +* Tue Apr 6 2021 Xavier Delaruelle <xavier.delarue...@cea.fr> - 4.7.1-1 +- Update to 4.7.1 + * Fri Feb 19 2021 Xavier Delaruelle <xavier.delarue...@cea.fr> - 4.7.0-1 - Update to 4.7.0 - Remove obsolete 'Group' tag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/contrib/vim/syntax/modulefile.vim new/modules-4.7.1/contrib/vim/syntax/modulefile.vim --- old/modules-4.7.0/contrib/vim/syntax/modulefile.vim 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/contrib/vim/syntax/modulefile.vim 2021-04-06 06:39:50.000000000 +0200 @@ -48,5 +48,8 @@ syn match modVar "\v<ModulesVersion>" +syn match modVar "\v<ModulesCurrentModulefile>" +syn match modVar "\v<ModuleTool>" +syn match modVar "\v<ModuleToolVersion>" hi def link modVar tclSpecial diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/build/INSTALL.txt new/modules-4.7.1/doc/build/INSTALL.txt --- old/modules-4.7.0/doc/build/INSTALL.txt 2021-02-19 09:03:53.000000000 +0100 +++ new/modules-4.7.1/doc/build/INSTALL.txt 2021-04-06 06:42:56.000000000 +0200 @@ -72,8 +72,8 @@ For instance to download then unpack the last release of Modules: - $ curl -LJO https://github.com/cea-hpc/modules/releases/download/v4.7.0/modules-4.7.0.tar.gz - $ tar xfz modules-4.7.0.tar.gz + $ curl -LJO https://github.com/cea-hpc/modules/releases/download/v4.7.1/modules-4.7.1.tar.gz + $ tar xfz modules-4.7.1.tar.gz Installation instructions @@ -503,23 +503,38 @@ to "dark". SGRLIST follows the same syntax than used in "LS_COLORS". Each element in SGRLIST is an output item associated to a Select Graphic Rendition (SGR) code. Elements in SGRLIST are - separated by ":". Output items are designated by keys. Items able - to be colorized are: highlighted element ("hi"), debug information - ("db"), trace information ("tr") tag separator ("se"); Error - ("er"), warning ("wa"), module error ("me") and info ("in") message - prefixes; Modulepath ("mp"), directory ("di"), module alias ("al"), - module symbolic version ("sy") and module "default" version ("de"). + separated by ":". Output items are designated by keys. + + Items able to be colorized are: highlighted element ("hi"), debug + information ("db"), trace information ("tr") tag separator ("se"); + Error ("er"), warning ("wa"), module error ("me") and info ("in") + message prefixes; Modulepath ("mp"), directory ("di"), module alias + ("al"), module symbolic version ("sy") and module "default" version + ("de"). + + Module tags can also be colorized. The key to set in the color + palette to get a graphical rendering of a tag is the tag name or + the tag abbreviation if one is defined for tag. The SGR code + applied to a tag name is ignored if an abbreviation is set for this + tag thus the SGR code should be defined for this abbreviation to + get a graphical rendering. Each basic tag has by default a key set + in the color palette, based on its abbreviated string: auto-loaded + ("aL"), forbidden ("F"), hidden and hidden-loaded ("H"), loaded + ("L"), nearly-forbidden ("nF"), sticky ("S") and super-sticky + ("sS"). + For a complete SGR code reference, see https://en.wikipedia.org/wi ki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters. (de fault="hi=1:db=2:tr=2:se=2:er=91:wa=93:me=95:in=94:mp=1;94:di=94:a - l=96:sy=95:de=4:cm=92") + l=96:sy=95:de=4:cm=92:aL=100:L=90;47:H=2:F=41:nF=43:S=46:sS=44") --with-light-background-colors=SGRLIST Default color set to apply if terminal background color is defined to "light". Expect the same syntax than described for "--with-dark- background-colors". (default="hi=1:db=2:tr=2:se=2:er=31:wa=33:me=3 - 5:in=34:mp=1;34:di=34:al=36:sy=35:de=4:cm=32") + 5:in=34:mp=1;34:di=34:al=36:sy=35:de=4:cm=32:aL=107:L=47:H=2:F=101 + :nF=103:S=106:sS=104") --with-terminal-background=VALUE @@ -566,8 +581,8 @@ Define the abbreviation to use when reporting each module tag. Each element in ABBRVLIST is a tag name associated to an abbreviation string (elements in ABBRVLIST are separated by ":"). (default - ="auto-loaded=aL:loaded=L:hidden=H:forbidden=F:nearly- - forbidden=nF") + ="auto-loaded=aL:loaded=L:hidden=H:hidden-loaded=H:forbidden=F + :nearly-forbidden=nF:sticky=S:super-sticky=sS") --with-tag-color-name=TAGLIST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/build/NEWS.txt new/modules-4.7.1/doc/build/NEWS.txt --- old/modules-4.7.0/doc/build/NEWS.txt 2021-02-19 09:03:54.000000000 +0100 +++ new/modules-4.7.1/doc/build/NEWS.txt 2021-04-06 06:42:57.000000000 +0200 @@ -6,6 +6,46 @@ admins. +Modules 4.7.1 (2021-04-06) +========================== + +* Doc: clarify the license terms used by the project. (fix issue + #389) + +* Align all files from the Modules project under the GPLv2+ license. + Scripts and libraries that were previously licensed with GPLv3+ have + been moved to GPLv2+ with the consent of their respective copyright + holders. (fix issue #389) + +* Revert "Install: have "configure" script assume the "." dot + directory when invoked without the prepended "./"" as consent was + not obtained from author to relicense the contribution to GPLv2+. + +* Doc: fixes few typos in module and modulefile. + +* Update the "sh-to-mod" mechanism to support version 3.2 of the + fish shell. Fish 3.2 introduces the "." builtin command that should + be regexp-escaped when determining the shell functions or aliases + defined by the script analyzed by "sh-to-mod". + +* Vim: update addon files to highlight modulefile variables + "ModuleTool", "ModuleToolVersion" and "ModulesCurrentModulefile". + +* Doc: update the description and default value of the "--with-dark- + background-colors" and "--with-light-background-colors" installation + options. + +* Doc: add description of changes that occurred on versions 4.6 and + 4.7 for the "--with-dark-background-colors" and "--with-light- + background-colors" installation options and for the "MODULES_COLORS" + environment variable. + +* Doc: correct the default value of the "--with-tag-abbrev" + installation option. + +* Doc: add Sticky modules cookbook recipe. + + Modules 4.7.0 (2021-02-19) ========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/build/ml.1 new/modules-4.7.1/doc/build/ml.1 --- old/modules-4.7.0/doc/build/ml.1 2021-02-19 09:03:48.000000000 +0100 +++ new/modules-4.7.1/doc/build/ml.1 2021-04-06 06:42:51.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "ML" "1" "2021-02-19" "4.7.0" "Modules" +.TH "ML" "1" "2021-04-06" "4.7.1" "Modules" .SH NAME ml \- handy command interface to the Modules package . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/build/module.1.in new/modules-4.7.1/doc/build/module.1.in --- old/modules-4.7.0/doc/build/module.1.in 2021-02-19 09:03:48.000000000 +0100 +++ new/modules-4.7.1/doc/build/module.1.in 2021-04-06 06:42:51.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "MODULE" "1" "2021-02-19" "4.7.0" "Modules" +.TH "MODULE" "1" "2021-04-06" "4.7.1" "Modules" .SH NAME module \- command interface to the Modules package . @@ -1018,8 +1018,8 @@ .INDENT 0.0 .TP .B search [\-a] [\-j] string -Seeks through the \fBmodule\-whatis\fP informations of all \fImodulefiles\fP -for the specified \fIstring\fP\&. All \fImodule\-whatis\fP informations matching the +Seeks through the \fBmodule\-whatis\fP information of all \fImodulefiles\fP +for the specified \fIstring\fP\&. All \fImodule\-whatis\fP information matching the \fIstring\fP in a case insensitive manner will be displayed. \fIstring\fP may contain wildcard characters. .UNINDENT @@ -1597,7 +1597,7 @@ foreground colors. See also \fI\%https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters\fP for a complete SGR code reference. .sp -No graphical rendition will be applied to an output item that could normaly +No graphical rendition will be applied to an output item that could normally be colored but which is not defined in the color set. Thus if \fI\%MODULES_COLORS\fP is defined empty, no output will be colored at all. .sp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/build/modulefile.4 new/modules-4.7.1/doc/build/modulefile.4 --- old/modules-4.7.0/doc/build/modulefile.4 2021-02-19 09:03:48.000000000 +0100 +++ new/modules-4.7.1/doc/build/modulefile.4 2021-04-06 06:42:51.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "MODULEFILE" "4" "2021-02-19" "4.7.0" "Modules" +.TH "MODULEFILE" "4" "2021-04-06" "4.7.1" "Modules" .SH NAME modulefile \- files containing Tcl code for the Modules package . @@ -696,7 +696,7 @@ reference counter environment variable is named by suffixing \fIvariable\fP by \fB_modshare\fP\&. .sp -When \fIvalue\fP is already defined in environement \fIvariable\fP, it is not added +When \fIvalue\fP is already defined in environment \fIvariable\fP, it is not added again except if \fB\-\-duplicates\fP option is set. .sp If the \fIvariable\fP is not set, it is created. When a \fImodulefile\fP is @@ -906,7 +906,7 @@ .B ModuleToolVersion The \fI\%ModuleToolVersion\fP variable contains the version of the \fImodule\fP implementation currently in use. The value of this variable is set to -\fB4.7.0\fP for this version of Modules. +\fB4.7.1\fP for this version of Modules. .UNINDENT .SH LOCATING MODULEFILES .sp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/.modulerc new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/.modulerc --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/.modulerc 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/.modulerc 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1,2 @@ +#%Module4.7 +module-tag sticky compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compA/1.0 new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compA/1.0 --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compA/1.0 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compA/1.0 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1 @@ +#%Module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compA/1.2 new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compA/1.2 --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compA/1.2 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compA/1.2 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1 @@ +#%Module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compB/1.3 new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compB/1.3 --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compB/1.3 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compB/1.3 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1 @@ +#%Module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compB/2.1 new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compB/2.1 --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/compiler/compB/2.1 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/compiler/compB/2.1 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1 @@ +#%Module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/core/.modulerc new/modules-4.7.1/doc/example/sticky-modules/modulefiles/core/.modulerc --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/core/.modulerc 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/core/.modulerc 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1,2 @@ +#%Module4.7 +module-tag super-sticky core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/core/1.0 new/modules-4.7.1/doc/example/sticky-modules/modulefiles/core/1.0 --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/core/1.0 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/core/1.0 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1 @@ +#%Module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/example/sticky-modules/modulefiles/core/2.0 new/modules-4.7.1/doc/example/sticky-modules/modulefiles/core/2.0 --- old/modules-4.7.0/doc/example/sticky-modules/modulefiles/core/2.0 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/example/sticky-modules/modulefiles/core/2.0 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1 @@ +#%Module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/source/conf.py new/modules-4.7.1/doc/source/conf.py --- old/modules-4.7.0/doc/source/conf.py 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/doc/source/conf.py 2021-04-06 06:39:50.000000000 +0200 @@ -79,7 +79,7 @@ else: return version, version + '+' + branch + '-' + tags else: - return '4.7.0', '' + return '4.7.1', '' # The short X.Y version. # The full version, including alpha/beta/rc tags. @@ -219,7 +219,7 @@ prefix = '/usr/share/Modules' bindir = prefix + '/bin' libexecdir = prefix + '/libexec' - etcdir = prefix + '/etc' + etcdir = '/etc/environment-modules' initdir = prefix + '/init' modulefilesdir = prefix + '/modulefiles' @@ -241,6 +241,7 @@ rst_epilog += '.. |bold etcdir| replace:: **%s**\n' % etcdir rst_epilog += '.. |file etcdir_rc| replace:: :file:`%s/rc`\n' % etcdir rst_epilog += '.. |file etcdir_siteconfig| replace:: :file:`%s/siteconfig.tcl`\n' % etcdir +rst_epilog += '.. |file etcdir_initrc| replace:: :file:`%s/initrc`\n' % etcdir rst_epilog += '.. |initdir| replace:: %s\n' % initdir rst_epilog += '.. |emph initdir| replace:: *%s*\n' % initdir rst_epilog += '.. |bold initdir| replace:: **%s**\n' % initdir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/source/cookbook/hide-and-forbid-modules.rst new/modules-4.7.1/doc/source/cookbook/hide-and-forbid-modules.rst --- old/modules-4.7.0/doc/source/cookbook/hide-and-forbid-modules.rst 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/doc/source/cookbook/hide-and-forbid-modules.rst 2021-04-06 06:39:50.000000000 +0200 @@ -1,4 +1,4 @@ -.. _hide-and-forbid-modules.rst: +.. _hide-and-forbid-modules: Hide and forbid modules ======================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/source/cookbook/sticky-modules.rst new/modules-4.7.1/doc/source/cookbook/sticky-modules.rst --- old/modules-4.7.0/doc/source/cookbook/sticky-modules.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/modules-4.7.1/doc/source/cookbook/sticky-modules.rst 2021-04-06 06:39:50.000000000 +0200 @@ -0,0 +1,171 @@ +.. _sticky-modules-rcp: + +Sticky modules +============== + +When providing a configurable environment to users, site's staff may require +that some part of this environment remain loaded whatever the user does. + +Such feature is for instance useful when every details of the user environment +are configured through the use of modulefiles. Even the core setup that is +usually configured through the :file:`/etc/profile.d` initialization scripts. +But by using modulefiles for core initialization, end users can fully see how +things are setup on their environment by using +:subcmd:`module display<display>`. When the environment core setup is achieved +by loading a specific modulefile, it is important that such module remains +loaded to keep this initial setup on whatever the module actions the user +performs over its environment. + +This recipe describes how to keep modulefiles loaded by forbidding their +unload. Such unloadable modules are called *sticky modules*. + +Implementation +-------------- + +:ref:`Sticky modules` are simply modules that cannot be unloaded once loaded. +Such behavior could be achieved by basically breaking the modulefile +evaluation when attempting to unload the sticky module: + +.. code-block:: tcl + + if {[module-info mode unload]} { + break + } + +Using the ``break`` Tcl command to stop the modulefile evaluation does not +require to install a recent version of Modules to get a basic sticky +mechanism. + +To get a smoother sticky mechanism with two different level of stickyness, +allowing to reload environment or to swap a sticky module by another +version of the same module name, the *sticky* and *super-sticky* module tags +have been introduced in Modules v4.7. + +A modulefile is declared *sticky* by applying it the ``sticky`` tag with the +:mfcmd:`module-tag` modulefile command. Such sticky module cannot be unloaded, +unless if the unload action is forced or if the module reloads after being +unloaded. + +Modulefile can also be defined ``super-sticky`` by applying the corresponding +module tag. *Super-sticky* module cannot be unloaded even if the unload action +is forced. It can only be unloaded if the module reloads afterward. + +In case the stickyness applies to the generic module name (and does not target +a specific module version or version-set), one version of the sticky or +super-sticky module can be swapped by another version of this same module. + +**Compatible with Modules v4.7+** + +Usage examples +-------------- + +For this recipe, a *core* module acts as the initial setup of user's +environment. This module must not be unloaded otherwise user's environment may +be considered broken. + +So this *core* module is tagged *super-sticky* with the :mfcmd:`module-tag` +modulefile command in :file:`core/.modulerc` file: + +.. code-block:: tcl + + module-tag super-sticky core + +Once module got loaded, it cannot be unloaded even if these unload actions are +forced. + +.. parsed-literal:: + + :ps:`$` module list + Currently Loaded Modulefiles: + 1) :sgrss:`core/1.0` + + Key: + :sgrss:`super-sticky` + :ps:`$` module unload core + Unloading :sgrhi:`core/1.0` + :sgrer:`ERROR`: Unload of super-sticky module 'core/1.0' skipped + :ps:`$` module purge -f + Unloading :sgrhi:`core/1.0` + :sgrer:`ERROR`: Unload of super-sticky module 'core/1.0' skipped + :ps:`$` module list + Currently Loaded Modulefiles: + 1) :sgrss:`core/1.0` + + Key: + :sgrss:`super-sticky` + +However it is still possible to change version of this *super-sticky* module. + +.. parsed-literal:: + + :ps:`$` module switch core/2.0 + :ps:`$` module list + Currently Loaded Modulefiles: + 1) :sgrss:`core/2.0` + + Key: + :sgrss:`super-sticky` + +In this recipe environment, the *compiler* module provides several flavors: +*compA* and *compB*. Site's staff have decided that user's environment should +always have a compiler module loaded by default. + +So the *compiler* module is set *sticky* with the :mfcmd:`module-tag` +modulefile command in :file:`compiler/.modulerc` file: + +.. code-block:: tcl + + module-tag sticky compiler + +As stickyness is defined over the generic *compiler* name, users can switch +between available compiler flavors: + +.. parsed-literal:: + + :ps:`$` module list + Currently Loaded Modulefiles: + 1) :sgrss:`core/2.0` 2) :sgrs:`compiler/compB/2.1` + + Key: + :sgrss:`super-sticky` :sgrs:`sticky` + :ps:`$` module switch compiler/compA + :ps:`$` module list + Currently Loaded Modulefiles: + 1) :sgrss:`core/2.0` 2) :sgrs:`compiler/compA/1.2` + + Key: + :sgrss:`super-sticky` :sgrs:`sticky` + +Unload attempt fails by default: + +.. parsed-literal:: + + :ps:`$` module unload compiler + Unloading :sgrhi:`compiler/compA/1.2` + :sgrer:`ERROR`: Unload of sticky module 'compiler/compA/1.2' skipped + +However if a user really wants to get rid of the *compiler* module, the unload +action can be forced: + +.. parsed-literal:: + + :ps:`$` module unload -f compiler + Unloading :sgrhi:`compiler/compA/1.2` + :sgrwa:`WARNING`: Unload of sticky module 'compiler/compA/1.2' forced + :ps:`$` module list + Currently Loaded Modulefiles: + 1) :sgrss:`core/2.0` + + Key: + :sgrss:`super-sticky` + +Last but not least, the sticky modules should get loaded when the user's shell +session initializes. So the *core* and *compiler* modules should be defined +for load in the initialization RC file |file etcdir_initrc|: + +.. code-block:: tcl + + #%Module + module use --append .../example/sticky-modules/modulefiles + module load core + module load compiler/compB diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/source/index.rst new/modules-4.7.1/doc/source/index.rst --- old/modules-4.7.0/doc/source/index.rst 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/doc/source/index.rst 2021-04-06 06:39:50.000000000 +0200 @@ -107,5 +107,5 @@ License ------- -Modules is distributed under the GNU General Public License version 2 (GPL -v2). +Modules is distributed under the GNU General Public License, either version 2 +or (at your option) any later version (GPL v2+). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/source/module.rst new/modules-4.7.1/doc/source/module.rst --- old/modules-4.7.0/doc/source/module.rst 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/doc/source/module.rst 2021-04-06 06:39:50.000000000 +0200 @@ -1165,8 +1165,8 @@ .. subcmd:: search [-a] [-j] string - Seeks through the :mfcmd:`module-whatis` informations of all *modulefiles* - for the specified *string*. All *module-whatis* informations matching the + Seeks through the :mfcmd:`module-whatis` information of all *modulefiles* + for the specified *string*. All *module-whatis* information matching the *string* in a case insensitive manner will be displayed. *string* may contain wildcard characters. @@ -1799,7 +1799,7 @@ foreground colors. See also https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters for a complete SGR code reference. - No graphical rendition will be applied to an output item that could normaly + No graphical rendition will be applied to an output item that could normally be colored but which is not defined in the color set. Thus if :envvar:`MODULES_COLORS` is defined empty, no output will be colored at all. @@ -1812,6 +1812,14 @@ .. versionadded:: 4.3 + .. versionchanged:: 4.6 + Output item for trace information (``tr``) added + + .. versionchanged:: 4.7 + Output items for module tags auto-loaded (``aL``), forbidden (``F``), + hidden and hidden-loaded (``H``), loaded (``L``), nearly-forbidden + (``nF``), sticky (``S``) and super-sticky (``sS``) added + .. envvar:: MODULES_EXTENDED_DEFAULT If set to ``1``, a specified module version is matched against starting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/doc/source/modulefile.rst new/modules-4.7.1/doc/source/modulefile.rst --- old/modules-4.7.0/doc/source/modulefile.rst 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/doc/source/modulefile.rst 2021-04-06 06:39:50.000000000 +0200 @@ -636,7 +636,7 @@ reference counter environment variable is named by suffixing *variable* by ``_modshare``. - When *value* is already defined in environement *variable*, it is not added + When *value* is already defined in environment *variable*, it is not added again except if ``--duplicates`` option is set. If the *variable* is not set, it is created. When a *modulefile* is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/envmodules.c new/modules-4.7.1/lib/envmodules.c --- old/modules-4.7.0/lib/envmodules.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/envmodules.c 2021-04-06 06:39:50.000000000 +0200 @@ -5,7 +5,7 @@ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/envmodules.h new/modules-4.7.1/lib/envmodules.h --- old/modules-4.7.0/lib/envmodules.h 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/envmodules.h 2021-04-06 06:39:50.000000000 +0200 @@ -5,7 +5,7 @@ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-0getgroups.c new/modules-4.7.1/lib/testutil-0getgroups.c --- old/modules-4.7.0/lib/testutil-0getgroups.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-0getgroups.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-GETGROUPS.C, Superseded getgroups function for test purpose - * Copyright (C) 2020 Xavier Delaruelle + * Copyright (C) 2020-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-closedir.c new/modules-4.7.1/lib/testutil-closedir.c --- old/modules-4.7.0/lib/testutil-closedir.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-closedir.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-CLOSEDIR.C, Superseded closedir function for test purpose - * Copyright (C) 2019 Xavier Delaruelle + * Copyright (C) 2019-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-dupgetgroups.c new/modules-4.7.1/lib/testutil-dupgetgroups.c --- old/modules-4.7.0/lib/testutil-dupgetgroups.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-dupgetgroups.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-DUPGETGROUPS.C, Superseded getgroups function for test purpose - * Copyright (C) 2020 Xavier Delaruelle + * Copyright (C) 2020-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-getgrgid.c new/modules-4.7.1/lib/testutil-getgrgid.c --- old/modules-4.7.0/lib/testutil-getgrgid.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-getgrgid.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-GETGRGID.C, Superseded getgrgid function for test purpose - * Copyright (C) 2020 Xavier Delaruelle + * Copyright (C) 2020-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-getgroups.c new/modules-4.7.1/lib/testutil-getgroups.c --- old/modules-4.7.0/lib/testutil-getgroups.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-getgroups.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-GETGROUPS.C, Superseded getgroups function for test purpose - * Copyright (C) 2020 Xavier Delaruelle + * Copyright (C) 2020-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-getpwuid.c new/modules-4.7.1/lib/testutil-getpwuid.c --- old/modules-4.7.0/lib/testutil-getpwuid.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-getpwuid.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-GETPWUID.C, Superseded getpwuid function for test purpose - * Copyright (C) 2020 Xavier Delaruelle + * Copyright (C) 2020-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-mktime.c new/modules-4.7.1/lib/testutil-mktime.c --- old/modules-4.7.0/lib/testutil-mktime.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-mktime.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-MKTIME.C, Superseded mktime function for test purpose - * Copyright (C) 2020 Xavier Delaruelle + * Copyright (C) 2020-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/lib/testutil-time.c new/modules-4.7.1/lib/testutil-time.c --- old/modules-4.7.0/lib/testutil-time.c 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/lib/testutil-time.c 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ /************************************************************************* * * TESTUTIL-TIME.C, Superseded time function for test purpose - * Copyright (C) 2020 Xavier Delaruelle + * Copyright (C) 2020-2021 Xavier Delaruelle * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/modulecmd.tcl.in new/modules-4.7.1/modulecmd.tcl.in --- old/modules-4.7.0/modulecmd.tcl.in 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/modulecmd.tcl.in 2021-04-06 06:39:50.000000000 +0200 @@ -4456,7 +4456,7 @@ set getfunc {set funcout (string match -r -v $funcfilter (functions\ -n) | while read f; functions $f; end);} set command "set -xgL; echo '$sep'; set funcfilter (string join '|'\ - (string replace \\\[ \\\\\\\[ (builtin -n)))\\|fish\\.\\*;\ + (string replace -r '(\\\[|\\.)' '\\\\\\\\\\\$1' (builtin -n)))\\|fish\\.\\*;\ $getfunc; $getfunc; string split \$funcout; echo '$sep'; string\ split \$funcout; echo '$sep'; pwd; echo '$sep'; source [listTo\ shell $shdesc] 2>&1; or exit \$status; echo '$sep'; set -xgL;\ @@ -4465,10 +4465,10 @@ set varre {^(\S+?\M) ?'?(.*?)'?$} # exclude alias from function list set funcre {^function (\S+?)(?: [^\n]*?--description\ - (?!'?alias)[^\n]+)?\n(.+?)\nend$} + (?!'?alias)[^\n]+)?\n(.+?)\s*\nend$} # fetch aliases from available functions set aliasre {^function (\S+?) [^\n]*?--description\ - '?alias[^\n]+\n\s*(.+?)\nend$} + '?alias[^\n]+\n\s*(.+?)\s*\nend$} # translate back fish-specific code set varvalmap [list {' '} : {\'} ' {\"} \" \\\\ \\] set alvalmap [list { $argv;} {}] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/script/envml new/modules-4.7.1/script/envml --- old/modules-4.7.0/script/envml 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/script/envml 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env bash # # ENVML, setup environment with module then run specified command -# Copyright (C) 2015 CEA/DAM +# Copyright (C) 2015-2021 CEA/DAM # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/script/envml.cmd new/modules-4.7.1/script/envml.cmd --- old/modules-4.7.0/script/envml.cmd 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/script/envml.cmd 2021-04-06 06:39:50.000000000 +0200 @@ -2,11 +2,11 @@ setlocal enabledelayedexpansion :: ENVML, setup environment with module then run specified command -:: Copyright (C) 2015 CEA/DAM +:: Copyright (C) 2015-2021 CEA/DAM :: :: This program is free software: you can redistribute it and/or modify :: it under the terms of the GNU General Public License as published by -:: the Free Software Foundation, either version 3 of the License, or +:: the Free Software Foundation, either version 2 of the License, or :: (at your option) any later version. :: :: This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/script/modulecmd.in new/modules-4.7.1/script/modulecmd.in --- old/modules-4.7.0/script/modulecmd.in 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/script/modulecmd.in 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/bin/sh # # MODULECMD, execute module command corresponding to active flavor -# Copyright (C) 2018 Xavier Delaruelle +# Copyright (C) 2018-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/script/mt new/modules-4.7.1/script/mt --- old/modules-4.7.0/script/mt 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/script/mt 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env bash # # MT, run specific part of the test suite -# Copyright (C) 2018-2020 Xavier Delaruelle +# Copyright (C) 2018-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/script/mtreview new/modules-4.7.1/script/mtreview --- old/modules-4.7.0/script/mtreview 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/script/mtreview 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env tclsh # # MTREVIEW, review test suite log file -# Copyright (C) 2019 Xavier Delaruelle +# Copyright (C) 2019-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/script/playdemo new/modules-4.7.1/script/playdemo --- old/modules-4.7.0/script/playdemo 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/script/playdemo 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env tclsh # # PLAYDEMO, play demos recorded with asciinema -# Copyright (C) 2019 Xavier Delaruelle +# Copyright (C) 2019-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_cmake new/modules-4.7.1/testsuite/bin/install_test_cmake --- old/modules-4.7.0/testsuite/bin/install_test_cmake 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_cmake 2021-04-06 06:39:50.000000000 +0200 @@ -1,10 +1,10 @@ # # INSTALL_TEST_CMAKE, cmake test script for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_csh new/modules-4.7.1/testsuite/bin/install_test_csh --- old/modules-4.7.0/testsuite/bin/install_test_csh 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_csh 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/bin/csh -f # # INSTALL_TEST_CSH, csh-kind test launcher for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_fish new/modules-4.7.1/testsuite/bin/install_test_fish --- old/modules-4.7.0/testsuite/bin/install_test_fish 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_fish 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/bin/fish # # INSTALL_TEST_SH, fish test launcher for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_perl new/modules-4.7.1/testsuite/bin/install_test_perl --- old/modules-4.7.0/testsuite/bin/install_test_perl 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_perl 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env perl # # INSTALL_TEST_PERL, perl test script for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_python new/modules-4.7.1/testsuite/bin/install_test_python --- old/modules-4.7.0/testsuite/bin/install_test_python 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_python 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env python # # INSTALL_TEST_PYTHON, python test script for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_r new/modules-4.7.1/testsuite/bin/install_test_r --- old/modules-4.7.0/testsuite/bin/install_test_r 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_r 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env Rscript # # INSTALL_TEST_R, R test script for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_ruby new/modules-4.7.1/testsuite/bin/install_test_ruby --- old/modules-4.7.0/testsuite/bin/install_test_ruby 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_ruby 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env ruby # # INSTALL_TEST_RUBY, ruby test script for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_sh new/modules-4.7.1/testsuite/bin/install_test_sh --- old/modules-4.7.0/testsuite/bin/install_test_sh 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_sh 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/bin/sh # # INSTALL_TEST_SH, sh-kind test launcher for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/bin/install_test_tcl new/modules-4.7.1/testsuite/bin/install_test_tcl --- old/modules-4.7.0/testsuite/bin/install_test_tcl 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/bin/install_test_tcl 2021-04-06 06:39:50.000000000 +0200 @@ -1,11 +1,11 @@ #!/usr/bin/env tclsh # # INSTALL_TEST_TCL, tcl test script for install non-reg suite -# Copyright (C) 2017 Xavier Delaruelle +# Copyright (C) 2017-2021 Xavier Delaruelle # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/install.00-init/005-init_ts.exp new/modules-4.7.1/testsuite/install.00-init/005-init_ts.exp --- old/modules-4.7.0/testsuite/install.00-init/005-init_ts.exp 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/install.00-init/005-init_ts.exp 2021-04-06 06:39:50.000000000 +0200 @@ -282,6 +282,8 @@ if {[info exists shell_path(fish)]} { regexp {version (.+)$} [exec $shell_path(fish) --version] match fish_version set fish_version_ge31 [expr {[lindex [lsort -dictionary [list $fish_version 3.1.0]] 0] eq {3.1.0}}] + set fish_version_ge32 [expr {[lindex [lsort -dictionary [list $fish_version 3.2.0]] 0] eq {3.2.0}}] + set fish_version_is31 [string match 3.1.* $fish_version] } # find ksh flavor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/install.00-init/040-subshell.exp new/modules-4.7.1/testsuite/install.00-init/040-subshell.exp --- old/modules-4.7.0/testsuite/install.00-init/040-subshell.exp 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/install.00-init/040-subshell.exp 2021-04-06 06:39:50.000000000 +0200 @@ -86,12 +86,12 @@ } } fish { - testall_cmd_re "$shell" "module --version" {} "$fish_nf.*" [expr {$fish_version_ge31 ? {1} : {127}}] - testall_cmd_re "$shell" "module foo" {} "$fish_nf.*" [expr {$fish_version_ge31 ? {1} : {127}}] - testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_ge31 ? {4} : {252}}] - testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_ge31 ? {5} : {123}}] + testall_cmd_re "$shell" "module --version" {} "$fish_nf.*" [expr {$fish_version_is31 ? {1} : {127}}] + testall_cmd_re "$shell" "module foo" {} "$fish_nf.*" [expr {$fish_version_is31 ? {1} : {127}}] + testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_is31 ? {4} : [expr {$fish_version_ge32 ? {255} : {252}}]}] + testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_is31 ? {5} : [expr {$fish_version_ge32 ? {255} : {123}}]}] if {$install_ml eq {y}} { - testall_cmd_re "$shell" "ml use $contrib_modpath\; ml purge\; ml null\; ml -null\; ml" {} ".*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*" [expr {$fish_version_ge31 ? {5} : {123}}] + testall_cmd_re "$shell" "ml use $contrib_modpath\; ml purge\; ml null\; ml -null\; ml" {} ".*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*" [expr {$fish_version_is31 ? {5} : [expr {$fish_version_ge32 ? {255} : {123}}]}] } } default { @@ -152,12 +152,12 @@ } } fish { - testall_cmd_re "$shell" "module --version" {} "$fish_nf.*" [expr {$fish_version_ge31 ? {1} : {127}}] - testall_cmd_re "$shell" "module foo" {} "$fish_nf.*" [expr {$fish_version_ge31 ? {1} : {127}}] - testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_ge31 ? {4} : {252}}] - testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_ge31 ? {5} : {123}}] + testall_cmd_re "$shell" "module --version" {} "$fish_nf.*" [expr {$fish_version_is31 ? {1} : {127}}] + testall_cmd_re "$shell" "module foo" {} "$fish_nf.*" [expr {$fish_version_is31 ? {1} : {127}}] + testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_is31 ? {4} : [expr {$fish_version_ge32 ? {255} : {252}}]}] + testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" {} ".*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*$fish_nf.*" [expr {$fish_version_is31 ? {5} : [expr {$fish_version_ge32 ? {255} : {123}}]}] if {$install_ml eq {y}} { - testall_cmd_re "$shell" "ml use $contrib_modpath\; ml purge\; ml null\; ml -null\; ml" {} ".*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*" [expr {$fish_version_ge31 ? {5} : {123}}] + testall_cmd_re "$shell" "ml use $contrib_modpath\; ml purge\; ml null\; ml -null\; ml" {} ".*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*$fish_nf_ml.*" [expr {$fish_version_is31 ? {5} : [expr {$fish_version_ge32 ? {255} : {123}}]}] } } default { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/testsuite/install.00-init/050-crossshell.exp new/modules-4.7.1/testsuite/install.00-init/050-crossshell.exp --- old/modules-4.7.0/testsuite/install.00-init/050-crossshell.exp 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/testsuite/install.00-init/050-crossshell.exp 2021-04-06 06:39:50.000000000 +0200 @@ -107,7 +107,7 @@ testall_cmd_re "$shell" "module --version" "" "$tcsh_nf" 1 } fish { - testall_cmd_re "$shell" "module --version" "" "$fish_nf.*" [expr {$fish_version_ge31 ? {1} : {127}}] + testall_cmd_re "$shell" "module --version" "" "$fish_nf.*" [expr {$fish_version_is31 ? {1} : {127}}] } } } @@ -161,7 +161,7 @@ testall_cmd_re "$shell" "module --version" "" "$tcsh_nf" 1 } fish { - testall_cmd_re "$shell" "module --version" "" "$fish_nf.*" [expr {$fish_version_ge31 ? {1} : {127}}] + testall_cmd_re "$shell" "module --version" "" "$fish_nf.*" [expr {$fish_version_is31 ? {1} : {127}}] } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modules-4.7.0/version.inc.in new/modules-4.7.1/version.inc.in --- old/modules-4.7.0/version.inc.in 2021-02-19 09:02:42.000000000 +0100 +++ new/modules-4.7.1/version.inc.in 2021-04-06 06:39:50.000000000 +0200 @@ -1,9 +1,9 @@ # Release definitions shared across the Makefiles of this project # run make to generate version.inc -MODULES_RELEASE := 4.7.0 -MODULES_BUILD_HASH := eea8bafd -MODULES_BUILD_REFS := HEAD -> master, tag: v4.7.0 -MODULES_BUILD_FDATE := 2021-02-19 09:02:42 +0100 +MODULES_RELEASE := 4.7.1 +MODULES_BUILD_HASH := d9c3883b +MODULES_BUILD_REFS := HEAD -> master, tag: v4.7.1 +MODULES_BUILD_FDATE := 2021-04-06 06:39:50 +0200 MODULES_BUILD := @MODULES_BUILD@ MODULES_BUILD_DATE := @MODULES_BUILD_DATE@
