From 5e98e01171ef2a2622e2b236942cd35b44b97ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Wisniewski?= <gregory@nexedi.com>
Date: Fri, 29 Jan 2010 12:45:17 +0000
Subject: [PATCH] Reduce indentation.
git-svn-id: https://svn.erp5.org/repos/neo/trunk@1547 71dcc9de-d417-0410-9af5-da40c76e7ee4
---
neo/master/handlers/election.py | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/neo/master/handlers/election.py b/neo/master/handlers/election.py
index 8543c2f0..20219927 100644
--- a/neo/master/handlers/election.py
+++ b/neo/master/handlers/election.py
@@ -157,16 +157,14 @@ class ClientElectionHandler(ElectionHandler):
if app.server == address:
# This is self.
continue
- else:
- n = app.nm.getByAddress(address)
- # master node must be known
- assert n is not None
-
- if uuid is not None:
- # If I don't know the UUID yet, believe what the peer
- # told me at the moment.
- if n.getUUID() is None or n.getUUID() != uuid:
- n.setUUID(uuid)
+ n = app.nm.getByAddress(address)
+ # master node must be known
+ assert n is not None, 'Unknown master node address:' % address
+ if uuid is not None:
+ # If I don't know the UUID yet, believe what the peer
+ # told me at the moment.
+ if n.getUUID() is None or n.getUUID() != uuid:
+ n.setUUID(uuid)
if primary_uuid is not None:
# The primary master is defined.
--
2.30.9