xenserver: Minor spec file cleanups
authorJustin Pettit <jpettit@nicira.com>
Thu, 1 Apr 2010 12:12:17 +0000 (05:12 -0700)
committerJustin Pettit <jpettit@nicira.com>
Tue, 6 Apr 2010 01:20:15 +0000 (18:20 -0700)
Remove compiled InterfaceReconfigure byte code on uninstall.  Also, fix
minor typo in error message.

xenserver/openvswitch-xen.spec

index ac2f2a0ffda356728d2bd6f0feac677a7657aa93..7b5e0228e7515a8fd69a39000e1fc08f78a9382d 100644 (file)
@@ -250,7 +250,7 @@ done
 plugin=$(readlink /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py)
 if [ "$plugin" != "/usr/share/openvswitch/scripts/XSFeatureVSwitch.py" ]; then
     rm -f /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py
-    ln -s /usr/share/openvswitch/scripts/XSFeatureVSwitch.py /usr/lib/xsconsole/plugins-base/ || printf "Could not link to vSswitch xsconsole plugin.\n"
+    ln -s /usr/share/openvswitch/scripts/XSFeatureVSwitch.py /usr/lib/xsconsole/plugins-base/ || printf "Could not link to Open vSwitch xsconsole plugin.\n"
 fi
 
 # Ensure all required services are set to run
@@ -292,6 +292,13 @@ if [ "$1" = "0" ]; then     # $1 = 1 for upgrade
         /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyo \
         || printf "Could not remove Open vSwitch xsconsole plugin.\n"
 
+    rm -f /usr/share/openvswitch/scripts/InterfaceReconfigure.pyc \
+        /usr/share/openvswitch/scripts/InterfaceReconfigure.pyo \
+        /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyc \
+        /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyo \
+        /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyc \
+        /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyo 
+
     # Restore original XenServer scripts
     for f in \
         /opt/xensource/libexec/interface-reconfigure \