Changeset 467cd2e for fedd/federation

Timestamp:

Sep 20, 2013 10:35:13 AM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

befb8e4

Parents:

1f9c361 (diff), b213b53 (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/federation/access.py (modified) (1 diff)

fedd/federation/access.py

@@ -357 +357 @@
 
         cmd = "%s %s" % (self.userconfcmd, project)
-        conf = subprocess.call(shlex.split(cmd),
+        try:
+            conf = subprocess.call(shlex.split(cmd),
                 stdout=cf, stderr=dev_null, close_fds=True)
+        except EnvironmentError,e:
+            raise service_error(service_error.internal,
+                    "Could not run userconf command: %s %s" \
+                            % (e.filename, e.strerror))
 
         self.auth.set_attribute(confid, "/%s" % str(confid))