Merge branch 'upstreammaster'

[sfa.git] / sfa / importer / __init__.py

diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py
index 969cc5b..20ef19d 100644 (file)
--- a/sfa/importer/__init__.py
+++ b/sfa/importer/__init__.py
@@ -19,7 +19,7 @@ class Importer:
     def __init__(self):
         self.config = Config()
         self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
-        self.logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
+        self.logger.setLevelFromOptVerbose(self.config.SFA_API_LOGLEVEL)
         self.auth_hierarchy = Hierarchy ()
         self.TrustedRoots = TrustedRoots(self.config.get_trustedroots_dir())    
    
@@ -105,11 +105,11 @@ class Importer:
         generic=Generic.the_flavour()
         importer_class = generic.importer_class()
         if importer_class:
-            logger.info ("Using flavour %s for importing (class %s)"%\
+            self.logger.info ("Using flavour %s for importing (class %s)"%\
                          (generic.flavour,importer_class.__name__))
-            testbed_importer = importer_class (auth_hierarchy, logger)
+            testbed_importer = importer_class (auth_hierarchy, self.logger)
             if testbed_importer:
                 testbed_importer.add_options(options)
-                testbed_importer.run (parser)
+                testbed_importer.run (options)