From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 12 Mar 2012 16:16:19 +0000 (-0400)
Subject: implement registry_import
X-Git-Tag: sfa-2.1-4~68
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a90105fdce76597a2364849440303dc55720c1a5;p=sfa.git

implement registry_import
---

diff --git a/sfa/clientbin/sfaadmin.py b/sfa/clientbin/sfaadmin.py
index 0b22998c..b208eb0c 100755
--- a/sfa/clientbin/sfaadmin.py
+++ b/sfa/clientbin/sfaadmin.py
@@ -82,7 +82,9 @@ class RegistryCommands(Commands):
    
 
     def import_registry(self):
-        pass
+        from sfa.importer import Importer
+        importer = Importer()
+        importer.run()
  
     
     @args('-a', '--all', dest='all', metavar='<all>', action='store_true', default=False,
@@ -90,7 +92,7 @@ class RegistryCommands(Commands):
     @args('-c', '--certs', dest='certs', metavar='<certs>', action='store_true', default=False,
           help='Remove all cached certs/gids found in %s' % Hierarchy().basedir )
     @args('-0', '--no-reinit', dest='reinit', metavar='<reinit>', action='store_false', default=True,
-          help='By default a new DB schema is installed after the cleanup; this option prevents that')
+          help='Prevents new DB schema from being installed after cleanup')
     def nuke(self, all=False, certs=False, reinit=True):
         from sfa.storage.dbschema import DBSchema
         from sfa.util.sfalogging import _SfaLogger