[tor-commits] [pytorctl/master] Eliminate a warn about a consensus miscount.

[mikeperry at torproject.org]

commit 3c438e013b2301f2c5e04bb1aceb907ae5f96576
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Jun 24 10:46:59 2011 -0700

    Eliminate a warn about a consensus miscount.
    
    By fixing the miscount, of course.
---
 TorCtl.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/TorCtl.py b/TorCtl.py
index edf9408..ac49574 100755
--- a/TorCtl.py
+++ b/TorCtl.py
@@ -1772,8 +1772,9 @@ class ConsensusTracker(EventHandler):
 
       r = r[0]
       ns = ns[0]
-      if ns.idhex in self.routers and self.routers[ns.idhex].orhash == r.orhash:
-        plog("NOTICE",
+      if ns.idhex in self.routers:
+        if self.routers[ns.idhex].orhash == r.orhash:
+          plog("NOTICE",
              "Got extra NEWDESC event for router "+ns.nickname+"="+ns.idhex)
       else:
         self.consensus_count += 1