Mercurial > cobalt-mk2 / changeset

--- a/hgpoll.py	Mon Jan 25 15:31:13 2016 +0200
+++ b/hgpoll.py	Tue Feb 02 20:47:47 2016 +0200
@@ -39,7 +39,6 @@
 from hgdb import HgCommitsDatabase
 import traceback
 import sys
-from munge import munge
 import datetime
 
 Repositories = []
@@ -172,8 +171,8 @@
 		for channel in irc_client.channels:
 			if channel.get_value ('btannounce', default=True):
 				irc_client.privmsg (channel.get_value ('name'),
-					"\003%d%s\003: commit\0035 %s\003 addresses issue\002\0032 %d\002: %s" % \
-					(repo.color, repo.name, cset, ticket_id), Bt.get_ticket_url(ticket_id))
+					"\003%d%s\003: commit\0035 %s\003 addresses issue\002\0032 %d\002\003: %s" % \
+					(repo.color, repo.name, cset, ticket_id, Bt.get_ticket_url(ticket_id)))
 
 	if need_update:
 		# We need to remove the note data, otherwise the ticket notes
@@ -278,7 +277,7 @@
 				continue
 
 		username = Config.find_developer_by_email (commit['email'])
-		committer = munge (username if username else commit['author'])
+		committer = username if username else commit['author']
 		descriptor = """commit""" if random.randrange (100) != 0 else """KERMIT"""
 
 		if not isMergeFromSandbox:
@@ -294,7 +293,7 @@
 			for length in [LENGTH_MINIMUM, LENGTH_SHORT, LENGTH_FULL]:
 				messages[length].append (commitMessage)
 
-			if not multiline:
+			if multiline:
 				messages[LENGTH_SHORT].append ('   ' + commit['message'].splitlines()[0])
 
 				for line in commit['message'].splitlines()[:4]: