From ee3d21b855a003fe77139da7d3d06e402d0ae622 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 1 Feb 2008 09:37:25 +0000 Subject: [PATCH] uninstall for chroot is broken --- system/TestPlc.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 -- 2.47.0