From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 1 Feb 2008 09:37:25 +0000 (+0000)
Subject: uninstall for chroot is broken
X-Git-Tag: 2008-02-11-last-vmware-support~33
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ee3d21b855a003fe77139da7d3d06e402d0ae622;p=tests.git

uninstall for chroot is broken
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 9c352ef..3e4a169 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -131,9 +131,12 @@ class TestPlc:
     def uninstall(self,options):
         # if there's a chroot-based myplc running, and then a native-based myplc is being deployed
         # it sounds safer to have the former uninstalled too
-        # so let's call both methods uncondionnally
-        self.uninstall_vserver(options)
-        self.uninstall_chroot(options)
+        # now the vserver method cannot be invoked for chroot instances as vservername is required
+        if self.vserver:
+            self.uninstall_vserver(options)
+            self.uninstall_chroot(options)
+        else:
+            self.uninstall_chroot(options)
         return True
 
     ### install