Changeset 94a00cb

Timestamp:

Feb 13, 2010 2:43:33 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

d87778f

Parents:

fe28bb2

Message:

Actually a missed commit.

Slightly clearer and more commented version of the previous commit.

File:

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

fedd/federation/emulab_access.py

@@ -1239 +1239 @@
                 if s.get("name", "") == 'userconfig' \
                         and s.get('visibility',"") == 'import':
+
+                    # Collect ther server and certificate info.
                     u = s.get('server', None)
-                    print "url %s" % u
                     for a in s.get('fedAttr', []):
                         if a.get('attribute',"") == 'cert':
@@ -1248 +1249 @@
                         cert = None
 
-                    if not cert:
+                    if cert:
+                        # Make a temporary certificate file for get_url.  The
+                        # finally clause removes it whether something goes
+                        # wrong (including an exception from get_url) or not.
+                        try:
+                            tfos, tn = tempfile.mkstemp(suffix=".pem")
+                            tf = os.fdopen(tfos, 'w')
+                            print >>tf, cert
+                            tf.close()
+                            get_url(u, tn, tmpdir, "userconf")
+                        except IOError, e:
+                            raise service_error(service.error.internal, 
+                                    "Cannot create temp file for " + 
+                                    "userconfig certificates: %s e")
+                        finally:
+                            if tn: os.remove(tn)
+                    else:
                         raise service_error(service_error.req,
                                 "No certificate for retreiving userconfig")
-                    try:
-                        tfos, tn = tempfile.mkstemp(suffix=".pem")
-                        tf = os.fdopen(tfos, 'w')
-                        print >>tf, cert
-                        tf.close()
-                        print "tn %s" % tn
-                        get_url(u, tn, tmpdir, "userconf")
-                    except IOError, e:
-                        raise service_error(service.error.internal, 
-                                "Cannot create temp file for " + 
-                                "userconfig certificates: %s e")
-                    finally:
-                        if tn: os.remove(tn)
                     break