rpms/module-init-tools/devel module-init-tools.spec, 1.37, 1.38 weak-modules, 1.10, 1.11

[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-serv8809

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
Handle really stupid modules.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- module-init-tools.spec	1 Aug 2006 09:31:04 -0000	1.37
+++ module-init-tools.spec	1 Aug 2006 09:44:43 -0000	1.38
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.12
+Release: 0.pre1.4.13
 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,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.13
+- Fix remove of modules in weak-modules (for broken module locations).
+
 * Tue Aug  1 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.12
 - Fix remove of modules in weak-modules (broken symlinks).
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- weak-modules	1 Aug 2006 09:31:04 -0000	1.10
+++ weak-modules	1 Aug 2006 09:44:43 -0000	1.11
@@ -12,8 +12,8 @@
 # General Public License (GPL).
 
 __author__ = "Jon Masters <jcm at redhat.com>"
-__version__ = "2.4"
-__date__ = "2006/08/01 10:30:00"
+__version__ = "2.5"
+__date__ = "2006/08/01 10:43:00"
 __copyright__ = "Copyright (C) 2006 Red Hat, Inc"
 __license__ = "GPL"
 
@@ -283,7 +283,7 @@
 	read_modules(modules)
 	kernel_kabi(kernels)
 
-	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
+	p = re.compile('^.*/lib/modules/([^/]*)/extra/([^/]*)/(.*)$')
 	for module in modules:
 
 		m = p.match(module)
@@ -300,13 +300,12 @@
 				+ "/weak-updates/" + m.group(2)
 			weak_path = weak_dir +"/"+m.group(3)
 
-			print "weak_path: "+weak_path
 			if os.path.lexists(weak_path):
 				weak_modfile=os.readlink(weak_path)
 				if weak_modfile == module:
 					if verbose == "yes":
 						print "remove: " \
-							+ weak_path
+							+ weak_dir
 					if dry_run == "no":
 						os.system("rm -rf "+weak_dir)
 						do_run_depmod="yes"