From c56d20383a432aa2c83e7e3c2beebdb49cbe9efc Mon Sep 17 00:00:00 2001
From: Matthew Hooker <matt@cloudscaling.com>
Date: Thu, 4 Aug 2011 15:30:39 -0400
Subject: [PATCH] fix syntax error

---
 nova/cloudpipe/pipelib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 46549c9d740c..2c4673f9e6f3 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -147,6 +147,6 @@ class CloudPipe(object):
             key_path = os.path.join(key_dir, '%s.pem' % key_name)
             with open(key_path, 'w') as f:
                 f.write(private_key)
-        except exception.Duplicate, os.error, IOError:
+        except (exception.Duplicate, os.error, IOError):
             pass
         return key_name