From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 16 Feb 2011 19:58:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
X-Git-Tag: nodemanager-2.0-28~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fc75d6b111f5c65f11573bae5f381ac168857276;hp=4ced87d3169c9eaa821128b3cc9ba59cccb29e33;p=nodemanager.git

Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
---

diff --git a/plugins/sfagids.py b/plugins/sfagids.py
index 88e2341..2723a7a 100644
--- a/plugins/sfagids.py
+++ b/plugins/sfagids.py
@@ -15,7 +15,7 @@ import traceback
 import tempfile
 try:
     from sfa.util.namespace import *
-    from sfa.util.config import Config
+    from sfa.util.config import Config as SfaConfig
     import sfa.util.xmlrpcprotocol as xmlrpcprotocol
     from sfa.trust.certificate import Keypair, Certificate
     from sfa.trust.credential import Credential
@@ -128,7 +128,7 @@ def install_trusted_certs(api):
 
 def get_keypair(config = None):
     if not config:
-        config = Config()
+        config = SfaConfig()
     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
     data_dir = config.data_path