Changeset e062282 for fedd/fedd_create.py

Timestamp:

Jul 7, 2012 5:42:28 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

7718539

Parents:

cd5b279 (diff), d064566 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/fedd_create.py (modified) (2 diffs)

fedd/fedd_create.py

@@ -269 +269 @@
 if opts.debug > 1: print >>sys.stderr, resp_dict
 
-proof = proof.from_dict(resp_dict.get('proof', {}))
-if proof and opts.auth_log:
-    log_authentication(opts.auth_log, 'New (create)', 'succeeded', proof)
+p = proof.from_dict(resp_dict.get('proof', {}))
+if p and opts.auth_log:
+    log_authentication(opts.auth_log, 'New (create)', 'succeeded', p)
 # Save the experiment ID certificate if we need it
 try:
@@ -343 +343 @@
 if e_fedid: print "fedid: %s" % e_fedid
 if st: print "status: %s" % st
-proof = proof.from_dict(resp_dict.get('proof', {}))
-if proof and opts.auth_log:
-    log_authentication(opts.auth_log, 'Create', 'succeeded', proof)
+#proof = proof.from_dict(resp_dict.get('proof', {}))
+p_list = resp_dict.get('proof', {})
+if p_list and opts.auth_log:
+    for p in p_list:
+        log_authentication(opts.auth_log, 'Create', 'succeeded', 
+                proof.from_dict(p))