rpms/module-init-tools/devel module-init-tools.spec, 1.30, 1.31 weak-modules, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13806

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
handle duplicate module names in a temporary way. Make generic later on.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- module-init-tools.spec	31 Jul 2006 01:45:11 -0000	1.30
+++ module-init-tools.spec	31 Jul 2006 01:53:30 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.5
+Release: 0.pre1.4.6
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,9 +98,10 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
-* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.5
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.6
 - Don't call depmod on removing a kernel.
 - Warn rather than exit if we can't process weak-updates on new kernel
+- Handle duplicate modules by picking the latter version of the two.
 
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.4
 - Don't call mkinitrd when removing a kernel.


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- weak-modules	31 Jul 2006 01:45:11 -0000	1.4
+++ weak-modules	31 Jul 2006 01:53:30 -0000	1.5
@@ -302,7 +302,12 @@
 		status,kernel = commands.getstatusoutput('uname -r')
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)\.ko$')
-	modfiles=os.popen("find /lib/modules")
+
+	# FIXME: at the moment, we sort the modules so that if two versions
+	# of a kmod are installed, we will end up linking the latter. In the
+	# end the module list should just be processed to prune out dups.
+
+	modfiles=os.popen("find /lib/modules | sort")
 	while true:
 		in_line=(modfiles.readline())[:-1]
 		if in_line == "":