Changeset d58ee5e for fedd/federation/experiment_control.py

Timestamp:

Jun 21, 2012 11:11:13 AM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

7ec0dc2, d064566

Parents:

ef7d689

Message:

ALways save creds, even on partial import

File:

• fedd/federation/experiment_control.py (modified) (2 diffs)

fedd/federation/experiment_control.py

@@ -1619 +1619 @@
                     "Bad request format (no NewRequestBody)")
 
-        if self.auth.import_credentials(data_list=req.get('credential', [])):
-            self.auth.save()
+        # import may partially succeed so always save credentials and warn
+        if not self.auth.import_credentials(data_list=req.get('credential', [])):
+            self.log.debug("Failed to import delegation credentials(!)")
+        self.auth.save()
 
         try:
@@ -2119 +2121 @@
 
         # Import information from the requester
-        if self.auth.import_credentials(data_list=req.get('credential', [])):
-            self.auth.save()
-        else:
+        # import may partially succeed so always save credentials and warn
+        if not self.auth.import_credentials(data_list=req.get('credential', [])):
             self.log.debug("Failed to import delegation credentials(!)")
+        self.auth.save()
 
         try: