From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 10 Dec 2015 10:47:53 +0000 (+0100)
Subject: bugfix, correct previous change on locating xmlsec1
X-Git-Tag: sfa-3.1-20~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8f365642f25f22cbbfae27bc12d31ac60517d840

bugfix, correct previous change on locating xmlsec1
---

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index 4c563183..3f658fbd 100644
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -893,7 +893,7 @@ class Credential(object):
             #cert_args = " ".join(['--trusted-pem %s' % x for x in trusted_certs])
             #command = '{} --verify --node-id "{}" {} {} 2>&1'.\
             #          format(self.xmlsec_path, ref, cert_args, filename)
-            xmlsec1 = cred.get_xmlsec1_path()
+            xmlsec1 = self.get_xmlsec1_path()
             if not xmlsec1:
                 raise Exception("Could not locate required 'xmlsec1' program")
             command = [ xmlsec1, '--verify', '--node-id', ref ]
diff --git a/sfa/trust/speaksfor_util.py b/sfa/trust/speaksfor_util.py
index af2f8b54..9e859248 100644
--- a/sfa/trust/speaksfor_util.py
+++ b/sfa/trust/speaksfor_util.py
@@ -368,7 +368,7 @@ def create_speaks_for(tool_gid, user_gid, ma_gid, \
     # --output signed.xml tosign.xml
     pems = "%s,%s,%s" % (user_key_file, user_gid.get_filename(),
                          ma_gid.get_filename())
-    xmlsec1 = cred.get_xmlsec1_path()
+    xmlsec1 = Credential.get_xmlsec1_path()
     if not xmlsec1:
         raise Exception("Could not locate required 'xmlsec1' program")
     cmd = [ xmlsec1,  '--sign',  '--privkey-pem', pems,