From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 4 Oct 2010 16:19:35 +0000 (+0200)
Subject: Merge branch 'master' of git.onelab.eu:/git/sfa
X-Git-Tag: sfa-1.0-2~9^2~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a84a9f560f623d7500622e275426ae0e12332a03;p=sfa.git

Merge branch 'master' of git.onelab.eu:/git/sfa

Conflicts:
	sfa/client/sfi.py
---

a84a9f560f623d7500622e275426ae0e12332a03
diff --cc sfa/client/sfi.py
index 3d9c0f17,e2b37930..d25c172d
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@@ -309,10 -314,10 +314,10 @@@ class Sfi
         self.cert_file = cert_file
         self.cert = Certificate(filename=cert_file) 
         # Establish connection to server(s)
-        if self.options.verbose : print "Contacting Registry at:", reg_url
+        self.logger.info("Contacting Registry at: %s"%reg_url)
 -       self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file, self.options.debug)  
 +       self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file, self.options)  
-        if self.options.verbose : print "Contacting Slice Manager at:", sm_url
+        self.logger.info("Contacting Slice Manager at: %s"%sm_url)
 -       self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file, self.options.debug)
 +       self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file, self.options)
  
         return