rpms/environment-modules/F-12 environment-modules.spec, 1.25, 1.26 modules.sh, 1.1, 1.2

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8310

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
- Don't load bash init script when bash is running as "sh" (bug #529745)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/environment-modules.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- environment-modules.spec	19 Oct 2009 16:39:18 -0000	1.25
+++ environment-modules.spec	23 Oct 2009 18:22:16 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
+- Don't load bash init script when bash is running as "sh" (bug #529745)
+
 * Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
 - Support different flavors of "sh" (bug #529493)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/modules.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modules.sh	19 Oct 2009 16:39:19 -0000	1.1
+++ modules.sh	23 Oct 2009 18:22:17 -0000	1.2
@@ -1 +1 @@
-. /usr/share/Modules/init/`basename $SHELL`
+. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``