[Libvirt-cim] [PATCH] Provider registration script does not uninstall classes correctly for Pegasus

[Heidi Eckhart]

# HG changeset patch
# User Heidi Eckhart <heidieck at linux.vnet.ibm.com>
# Date 1193911654 -3600
# Node ID 1d63d3271f9037ec0699808fec54bd5083aea849
# Parent  a44ff1bcb3942783ac939d843dfbe04efe677166
Provider registration script does not uninstall classes correctly for Pegasus
Signed-off-by: Heidi Eckhart <heidieck at linux.vnet.ibm.com>

diff -r a44ff1bcb394 -r 1d63d3271f90 Makefile.am
--- a/Makefile.am	Thu Nov 01 11:06:09 2007 +0100
+++ b/Makefile.am	Thu Nov 01 11:07:34 2007 +0100
@@ -86,12 +86,12 @@ EXTRA_DIST = schema $(pkgdata_DATA) $(pk
 # @CIMSERVER@ is set by the configure script
 postinstall:
 	sh register_base.sh @CIMSERVER@ $(EXTRA_BASE_MOFS)
-	sh provider-register.sh -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS)
-	sh provider-register.sh -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS)
+	sh provider-register.sh -v -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS)
+	sh provider-register.sh -v -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS)
 
 preuninstall:
-	sh provider-register.sh -d -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS)
-	sh provider-register.sh -d -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS)
+	sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS)
+	sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS)
 
 rpm: clean
 	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
diff -r a44ff1bcb394 -r 1d63d3271f90 provider-register.sh
--- a/provider-register.sh	Thu Nov 01 11:06:09 2007 +0100
+++ b/provider-register.sh	Thu Nov 01 11:07:34 2007 +0100
@@ -262,7 +262,7 @@ pegasus_uninstall()
 	    echo "Error: wbemexec not found" >&2
 	    return 1
 	fi
-	CLASSES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 1 | grep -v '^CIM_'`
+	CLASSES=`cat $mymofs 2> /dev/null | grep '^class'| cut -d ' ' -f 2 | uniq`
 
 	for _TEMPDIR in /var/tmp /tmp
 	  do