From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 2 Oct 2012 21:40:41 +0000 (-0400)
Subject: Fix a goof.  I ihad initialized nick_trial at the wrong place.
X-Git-Tag: 1.5~17
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1d119b92ebbbc377218d9b58ae8716a12bc36dcc;p=irker.git

Fix a goof.  I ihad initialized nick_trial at the wrong place.
---

diff --git a/irkerd b/irkerd
index bbd11a0..2b5e21a 100755
--- a/irkerd
+++ b/irkerd
@@ -104,7 +104,7 @@ class Connection:
         self.irker = irkerd
         self.servername = servername
         self.port = port
-        self.nick_trial = random.randint(1, 990)
+        self.nick_trial = None
         self.connection = None
         self.status = "unseen"
         self.last_xmit = time.time()
@@ -165,7 +165,8 @@ class Connection:
             if not self.connection:
                 self.connection = self.irker.irc.server()
                 self.connection.context = self
-                self.nick_trial = 1
+                # Try to avoid colliding with other instances
+                self.nick_trial = random.randint(1, 990)
                 self.channels_joined = []
                 # This will throw irc.client.ServerConnectionError on failure
                 try: