Add patch to comment out stray module use in modules file when not using versioning (bug #895555)
Add patch to fix module clear command (bug #895551) Add patch from modules list to add completion to avail command
This commit is contained in:
parent
7d528ce172
commit
dcf9388ef3
12
environment-modules-avail.patch
Normal file
12
environment-modules-avail.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up modules-3.2.10/init/bash_completion.in.avail modules-3.2.10/init/bash_completion.in
|
||||
--- modules-3.2.10/init/bash_completion.in.avail 2012-10-25 13:33:34.000000000 -0600
|
||||
+++ modules-3.2.10/init/bash_completion.in 2013-01-15 12:05:37.247309733 -0700
|
||||
@@ -56,7 +56,7 @@ _module() {
|
||||
unuse) COMPREPLY=( $(IFS=: compgen -W "${MODULEPATH}" -- "$cur") );;
|
||||
use|*-a*) ;; # let readline handle the completion
|
||||
-u|--userlvl) COMPREPLY=( $(compgen -W "novice expert advanced" -- "$cur") );;
|
||||
- display|help|show|whatis)
|
||||
+ av*|disp*|help|show|whatis)
|
||||
COMPREPLY=( $(compgen -W "$(_module_avail)" -- "$cur") );;
|
||||
*) if test $COMP_CWORD -gt 2
|
||||
then
|
11
environment-modules-clear.patch
Normal file
11
environment-modules-clear.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- modules-3.2.9/utility.c 2011-11-28 22:27:13.000000000 +0100
|
||||
+++ modules-3.2.9-new/utility.c 2012-06-13 15:17:41.570629148 +0200
|
||||
@@ -727,7 +727,7 @@ int Output_Modulefile_Changes( Tcl_Inter
|
||||
output_unset_variable( (char*) key);
|
||||
} else {
|
||||
val = EMGetEnv(interp, key);
|
||||
- if(val && *val)
|
||||
+ if(val)
|
||||
output_set_variable(interp, (char*) key, val);
|
||||
null_free((void *)&val);
|
||||
}
|
10
environment-modules-versioning.patch
Normal file
10
environment-modules-versioning.patch
Normal file
@ -0,0 +1,10 @@
|
||||
diff -up modules-3.2.10/modulefiles/modules.in.versioning modules-3.2.10/modulefiles/modules.in
|
||||
--- modules-3.2.10/modulefiles/modules.in.versioning 2012-10-25 13:33:34.000000000 -0600
|
||||
+++ modules-3.2.10/modulefiles/modules.in 2013-01-15 11:30:22.046031158 -0700
|
||||
@@ -26,5 +26,5 @@ setenv MODULESHOME $prefix
|
||||
prepend-path PATH @bindir@
|
||||
prepend-path MANPATH @mandir@
|
||||
|
||||
-module use @VERSIONPATH@
|
||||
+@VERSIONING@module use @VERSIONPATH@
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: environment-modules
|
||||
Version: 3.2.10
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Provides dynamic modification of a user's environment
|
||||
|
||||
Group: System Environment/Base
|
||||
@ -11,6 +11,14 @@ Source1: modules.sh
|
||||
Source2: createmodule.sh
|
||||
Source3: createmodule.py
|
||||
Patch0: environment-modules-3.2.7-bindir.patch
|
||||
# Comment out stray module use in modules file when not using versioning
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=895555
|
||||
Patch1: environment-modules-versioning.patch
|
||||
# Fix module clear command
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=895551
|
||||
Patch2: environment-modules-clear.patch
|
||||
# Patch from modules list to add completion to avail command
|
||||
Patch3: environment-modules-avail.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: tcl-devel, tclx-devel, libX11-devel
|
||||
@ -47,6 +55,9 @@ have access to the module alias.
|
||||
%prep
|
||||
%setup -q -n modules-%{version}
|
||||
%patch0 -p1 -b .bindir
|
||||
%patch1 -p1 -b .versioning
|
||||
%patch2 -p1 -b .clear
|
||||
%patch3 -p1 -b .avail
|
||||
|
||||
|
||||
%build
|
||||
@ -94,6 +105,12 @@ make test
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 15 2013 Orion Poplawski <orion@cora.nwra.com> - 3.2.10-2
|
||||
- Add patch to comment out stray module use in modules file when not using
|
||||
versioning (bug #895555)
|
||||
- Add patch to fix module clear command (bug #895551)
|
||||
- Add patch from modules list to add completion to avail command
|
||||
|
||||
* Fri Dec 21 2012 Orion Poplawski <orion@cora.nwra.com> - 3.2.10-1
|
||||
- Update to 3.2.10
|
||||
- Drop regex patch
|
||||
|
Loading…
Reference in New Issue
Block a user