reconnect.py: Fix Python 2.4 compatibility break.

Commit 5eda645e36 (ovsdb-server: Report time since last connect and disconnect
for each manager.) used a conditional expression in reconnect.py. That syntax
is only supported in Python 2.5 and later. XenServer 5.6 is based on RHEL 5,
which uses Python 2.4.3, so various OVS scripts on XenServer fail with Python
tracebacks.

Reported-by: Cedric Hobbs <cedric@nicira.com>

diff --git a/python/ovs/reconnect.py b/python/ovs/reconnect.py
index 49c7a094cf75d4570f600fd40123e635624e327a..5fc96bc8713a568a3ba7dc990be4bfd12ab8ce2d 100644 (file)
--- a/python/ovs/reconnect.py
+++ b/python/ovs/reconnect.py
@@ -558,8 +558,9 @@ class Reconnect(object):
         stats.is_connected = self.is_connected()
         stats.msec_since_connect = self.get_last_connect_elapsed(now)
         stats.msec_since_disconnect = self.get_last_disconnect_elapsed(now)
-        stats.total_connected_duration = self.total_connected_duration + \
-            (self.get_last_connect_elapsed(now) if self.is_connected() else 0)
+        stats.total_connected_duration = self.total_connected_duration
+        if self.is_connected():
+            stats.total_connected_duration += self.get_last_connect_elapsed(now)
         stats.n_attempted_connections = self.n_attempted_connections
         stats.n_successful_connections = self.n_successful_connections
         stats.state = self.state.name