From aca0456b8c60aba2c2b0d18c55265fc7dadbab90 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 5 Jul 2012 12:13:06 +0200 Subject: [PATCH] revert to using sfaadmin reg import_registry for lxc16 builds that don't run the latest sfa --- system/TestPlc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/TestPlc.py b/system/TestPlc.py index 0813baf..9cad404 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -1293,7 +1293,7 @@ class TestPlc: def sfa_dbclean(self): "thoroughly wipes off the SFA database" - return self.run_in_guest("sfaadmin registry nuke")==0 or \ + return self.run_in_guest("sfaadmin reg nuke")==0 or \ self.run_in_guest("sfa-nuke.py")==0 or \ self.run_in_guest("sfa-nuke-plc.py")==0 @@ -1441,7 +1441,7 @@ class TestPlc: "sfa-import-plc" auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] return \ - self.run_in_guest('sfaadmin reg import')==0 + self.run_in_guest('sfaadmin reg import_registry')==0 # not needed anymore # self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth)) -- 2.43.0