From: Piotr Siwczak <psiwczak@internap.com>
Date: Tue, 12 Jun 2012 20:57:08 +0000 (-0700)
Subject: Fix python2.4 incompatibility
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3e763b4ca4212d99586726202925280cf1f739a5;p=openstack-build%2Fneutron-build.git

Fix python2.4 incompatibility

python2.4 compatibility is needed for the agent
to work on Xen

Change-Id: Ifa81a5ddb4f2a9dcb6ce94fa0d941ba6e6c2e038
---

diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
index ee9a16480..1910c8275 100755
--- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
+++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
@@ -133,7 +133,7 @@ class OVSQuantumAgent(object):
             all_bindings = {}
             try:
                 ports = db.ports.all()
-            except Exception as e:
+            except Exception, e:
                 LOG.info("Unable to get port bindings! Exception: %s" % e)
                 db_connected = False
                 continue
@@ -144,7 +144,7 @@ class OVSQuantumAgent(object):
             vlan_bindings = {}
             try:
                 vlan_binds = db.vlan_bindings.all()
-            except Exception as e:
+            except Exception, e:
                 LOG.info("Unable to get vlan bindings! Exception: %s" % e)
                 db_connected = False
                 continue
@@ -203,7 +203,7 @@ class OVSQuantumAgent(object):
             old_local_bindings = new_local_bindings
             try:
                 db.commit()
-            except Exception as e:
+            except Exception, e:
                 LOG.info("Unable to commit to database! Exception: %s" % e)
                 db.rollback()
                 old_local_bindings = {}