Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lua-lmod for openSUSE:Factory checked in at 2021-06-09 21:51:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-lmod (Old) and /work/SRC/openSUSE:Factory/.lua-lmod.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-lmod" Wed Jun 9 21:51:44 2021 rev:30 rq:898370 version:8.4.28 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-lmod/lua-lmod.changes 2021-05-10 15:34:15.390775703 +0200 +++ /work/SRC/openSUSE:Factory/.lua-lmod.new.32437/lua-lmod.changes 2021-06-09 21:51:56.242435737 +0200 @@ -1,0 +2,11 @@ +Tue Jun 8 11:46:55 UTC 2021 - Egbert Eich <[email protected]> + +- Adding missing brackets in csh script. + +------------------------------------------------------------------- +Thu Jun 3 23:19:40 UTC 2021 - Matej Cepl <[email protected]> + +- Modify generating of /etc/profile.d/lmod.* to allow use of existing + $MODULEPATH environmental variable (bsc#1159563). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-lmod.spec ++++++ --- /var/tmp/diff_new_pack.0HRZm3/_old 2021-06-09 21:51:57.042437163 +0200 +++ /var/tmp/diff_new_pack.0HRZm3/_new 2021-06-09 21:51:57.054437184 +0200 @@ -195,9 +195,9 @@ export LMOD_PREPEND_BLOCK=normal if [ \$EUID -eq 0 ]; then - export MODULEPATH=%{?OHPC_MODULES:%{OHPC_ADMIN}/modulefiles:%{OHPC_MODULES}:}%{lua_lmod_admin_modulesdir}:%{lua_lmod_modulesdir} + export MODULEPATH=\${MODULEPATH:+\${MODULEPATH}:}%{?OHPC_MODULES:%{OHPC_ADMIN}/modulefiles:%{OHPC_MODULES}:}%{lua_lmod_admin_modulesdir}:%{lua_lmod_modulesdir} else - export MODULEPATH=%{?OHPC_MODULES:%{OHPC_MODULES}:}%{lua_lmod_modulesdir} + export MODULEPATH=\${MODULEPATH:+\${MODULEPATH}:}%{?OHPC_MODULES:%{OHPC_MODULES}:}%{lua_lmod_modulesdir} fi export BASH_ENV=%{_datadir}/lmod/%{version}/init/bash @@ -227,10 +227,16 @@ setenv LMOD_COLORIZE "no" setenv LMOD_PREPEND_BLOCK "normal" +if ( \${?MODULEPATH} ) then + setenv MODULEPATH "\${MODULEPATH}:" +else + setenv MODULEPATH "" +endif + if ( \`id -u\` == "0" ) then - setenv MODULEPATH "%{?OHPC_MODULES:%{OHPC_ADMIN}/modulefiles:%{OHPC_MODULES}:}%{lua_lmod_admin_modulesdir}:%{lua_lmod_modulesdir}" + setenv MODULEPATH "\${MODULEPATH}%{?OHPC_MODULES:%{OHPC_ADMIN}/modulefiles:%{OHPC_MODULES}:}%{lua_lmod_admin_modulesdir}:%{lua_lmod_modulesdir}" else - setenv MODULEPATH "%{?OHPC_MODULES:%{OHPC_MODULES}:}%{lua_lmod_modulesdir}" + setenv MODULEPATH "\${MODULEPATH}%{?OHPC_MODULES:%{OHPC_MODULES}:}%{lua_lmod_modulesdir}" endif # Initialize modules system ++++++ Messages-Remove-message-about-creating-a-consulting-ticket.patch ++++++ --- /var/tmp/diff_new_pack.0HRZm3/_old 2021-06-09 21:51:57.082437234 +0200 +++ /var/tmp/diff_new_pack.0HRZm3/_new 2021-06-09 21:51:57.082437234 +0200 @@ -7,10 +7,16 @@ Signed-off-by: Egbert Eich <[email protected]> --- -diff -Nrua a/messageDir/de.lua b/messageDir/de.lua +--- + messageDir/de.lua | 1 - + messageDir/en.lua | 1 - + messageDir/es.lua | 1 - + messageDir/fr.lua | 2 -- + 4 files changed, 5 deletions(-) + --- a/messageDir/de.lua +++ b/messageDir/de.lua -@@ -105,7 +105,6 @@ +@@ -106,7 +106,6 @@ Verwenden Sie folgendes Kommando, um das $ module swap %{oldName} %{fullName} @@ -18,10 +24,9 @@ ]==], e_Illegal_Load = nil, e_Illegal_option = nil, -diff -Nrua a/messageDir/en.lua b/messageDir/en.lua --- a/messageDir/en.lua +++ b/messageDir/en.lua -@@ -118,7 +118,6 @@ +@@ -125,7 +125,6 @@ To correct the situation, please execute $ module swap %{oldName} %{fullName} @@ -29,10 +34,9 @@ ]==], e_Illegal_Load = [==[The following module(s) are illegal: %{module_list} Lmod does not support modulefiles that start with two or more underscores -diff -Nrua a/messageDir/es.lua b/messageDir/es.lua --- a/messageDir/es.lua +++ b/messageDir/es.lua -@@ -83,7 +83,6 @@ +@@ -84,7 +84,6 @@ Para solucionar esta situaci??n, introdu $ module swap %{oldName} %{fullName} @@ -40,10 +44,9 @@ ]==], e_Illegal_option = nil, e_Illegal_Load = nil, -diff -Nrua a/messageDir/fr.lua b/messageDir/fr.lua --- a/messageDir/fr.lua +++ b/messageDir/fr.lua -@@ -110,8 +110,6 @@ +@@ -111,8 +111,6 @@ Pour corriger le probl??me, vous pouvez $ module swap %{oldName} %{fullName} @@ -52,4 +55,3 @@ ]==], e_Illegal_Load = nil, e_Illegal_option = nil, -
