func/overlord/client.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a9ecc9d3f9d08115f4c548d76851d8554f49a248
Author: Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>
Date: Fri Oct 15 13:51:52 2010 -0400
fix exception catch in delegation - thanks to greg
diff --git a/func/overlord/client.py b/func/overlord/client.py
index 46b6c97..20c70a4 100644
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -19,6 +19,7 @@ import os
import time
import shlex
import subprocess
+from exceptions import Exception
import re
import fnmatch
import func.yaml as yaml
@@ -495,7 +496,7 @@ class Overlord(object):
try:
mapstream = file(self.mapfile, 'r').read()
self.minionmap = yaml.load(mapstream).next()
- except e:
+ except Exception, e:
sys.stderr.write("mapfile load failed, switching delegation off")
self.delegate = False
_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list
