rpms/environment-modules
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to fix unload from loaded modulefile (bug #1117334)

Browse Source
This commit is contained in:
Orion Poplawski 2015-07-13 14:37:35 -06:00
parent 48d546a977
commit 6b4be82049
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
environment-modules-3.2.10-unload-from-module.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up modules-3.2.10/ModuleCmd_Load.c.unload_from_modulefile modules-3.2.10/ModuleCmd_Load.c
--- modules-3.2.10/ModuleCmd_Load.c.unload_from_modulefile 2014-07-08 10:43:41.615212949 +0200
+++ modules-3.2.10/ModuleCmd_Load.c 2014-07-08 13:49:21.674701003 +0200
@@ -126,7 +126,7 @@ int ModuleCmd_Load( Tcl_Interp *interp,
** Set up the flags controling the Tcl callback functions
**/
- /* avoid changes when invoked as a subcommand */
+ /* avoid changes when invoked as a subcommand and loading */
if (!(g_flags & M_SUBCMD)) {
if( load) {
g_flags |= M_LOAD;
@@ -136,6 +136,11 @@ int ModuleCmd_Load( Tcl_Interp *interp,
g_flags &= ~M_LOAD;
}
g_flags |= M_SUBCMD;
+ } else {
+ if (!load) {
+ g_flags |= M_REMOVE;
+ g_flags &= ~M_LOAD;
+ }
}
/**

9
environment-modules.spec
View File

@ -2,7 +2,7 @@
Name: environment-modules Name: environment-modules
Version: 3.2.10 Version: 3.2.10
Release: 15%{?dist} Release: 16%{?dist}
Summary: Provides dynamic modification of a user's environment Summary: Provides dynamic modification of a user's environment
Group: System Environment/Base Group: System Environment/Base
@ -33,6 +33,9 @@ Patch5: environment-modules-tcl86.patch
# https://sourceforge.net/p/modules/patches/15/ # https://sourceforge.net/p/modules/patches/15/
# https://bugzilla.redhat.com/show_bug.cgi?id=1184979 # https://bugzilla.redhat.com/show_bug.cgi?id=1184979
Patch6: environment-modules-py3-and-doc-fix.patch Patch6: environment-modules-py3-and-doc-fix.patch
# Fix unload from loaded modulefile
# https://bugzilla.redhat.com/show_bug.cgi?id=1117334
Patch7: environment-modules-3.2.10-unload-from-module.patch
BuildRequires: tcl-devel, tclx-devel, libX11-devel BuildRequires: tcl-devel, tclx-devel, libX11-devel
BuildRequires: dejagnu BuildRequires: dejagnu
@ -77,6 +80,7 @@ have access to the module alias.
%patch4 -p1 -b .format %patch4 -p1 -b .format
%patch5 -p1 -b .tcl86 %patch5 -p1 -b .tcl86
%patch6 -p1 -b .py3 %patch6 -p1 -b .py3
%patch7 -p1 -b .unload-from-module
%build %build
@ -140,6 +144,9 @@ fi
%changelog %changelog
* Mon Jul 13 2015 Orion Poplwski <orion@cora.nwra.com> - 3.2.10-16
- Add patch to fix unload from loaded modulefile (bug #1117334)
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.10-15 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.10-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild