Merge lp:~lderan/ubuntu-bots/meeetingology-output into lp:~ubuntu-bots/ubuntu-bots/meetingology

Proposed by Thomas Molloy
Status: Merged
Merged at revision: 16
Proposed branch: lp:~lderan/ubuntu-bots/meeetingology-output
Merge into: lp:~ubuntu-bots/ubuntu-bots/meetingology
Diff against target: 14 lines (+4/-0)
1 file modified
items.py (+4/-0)
To merge this branch: bzr merge lp:~lderan/ubuntu-bots/meeetingology-output
Reviewer Review Type Date Requested Status
Alan Bell Approve
Review via email: mp+205378@code.launchpad.net

Description of the change

A fix to stop the meetingbot from crashing when #endmeeting is called before #endvote if there is a vote ongoing

To post a comment you must log in.
Revision history for this message
Alan Bell (alanbell) :
review: Approve
16. By Alan Bell

accepting merge for closing meetings correctly

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'items.py'
2--- items.py 2013-11-19 23:47:26 +0000
3+++ items.py 2014-02-07 14:59:10 +0000
4@@ -187,6 +187,10 @@
5 def __init__(self, nick, line, linenum, time_):
6 self.nick = nick ; self.line = line ; self.linenum = linenum
7 self.time = time.strftime("%H:%M", time_)
8+ def __init__(self, nick, line, linenum):
9+ time_ = time.localtime()
10+ self.nick = nick ; self.line = line ; self.linenum = linenum
11+ self.time = time.strftime("%H:%M", time_)
12 def _htmlrepl(self, M):
13 repl = self.get_replacements(M, escapewith=writers.html)
14 repl['link'] = self.logURL(M)

Subscribers

People subscribed via source and target branches