1
=== modified file 'ibid/config.ini'
2
--- ibid/config.ini	2009-03-02 11:59:56 +0000
3
+++ ibid/config.ini	2009-03-16 21:33:13 +0000
4
@@ -36,7 +36,7 @@
5
36
    [[pb]]
36
    [[pb]]
6
37
    [[reaper]]
37
    [[reaper]]
7
38
        type = silc
38
        type = silc
9
39
        server = silc.za.net
39
        server = reaper.org
10
40
        channels = ibid,
40
        channels = ibid,
11
41
        name = Ibid Bot
41
        name = Ibid Bot
12
42
    [[campfire]]
42
    [[campfire]]
13
43
43
14
=== modified file 'ibid/plugins/bzr.py'
15
--- ibid/plugins/bzr.py	2009-03-10 10:34:37 +0000
16
+++ ibid/plugins/bzr.py	2009-03-16 21:25:00 +0000
17
@@ -116,10 +116,14 @@
18
116
    def launchpad(self, event):
116
    def launchpad(self, event):
19
117
        if event.source.lower() not in ibid.sources \
117
        if event.source.lower() not in ibid.sources \
20
118
                or ibid.sources[event.source.lower()].type != 'smtp' \
118
                or ibid.sources[event.source.lower()].type != 'smtp' \
22
119
                or 'X-Launchpad-Branch' not in event.headers:
119
                or 'X-Launchpad-Project' not in event.headers:
23
120
            return
120
            return
24
121
121
25
122
        event.processed = True
122
        event.processed = True
26
123
27
124
        if 'X-Launchpad-Branch' not in event.headers or 'X-Launchpad-Branch-Revision-Number' not in event.headers:
28
125
            return
29
126
30
123
        if event.headers['X-Launchpad-Branch'] in self.launchpad_branches:
127
        if event.headers['X-Launchpad-Branch'] in self.launchpad_branches:
31
124
            self.remote_committed(self.launchpad_branches[event.headers['X-Launchpad-Branch']], int(event.headers['X-Launchpad-Branch-Revision-Number']))
128
            self.remote_committed(self.launchpad_branches[event.headers['X-Launchpad-Branch']], int(event.headers['X-Launchpad-Branch-Revision-Number']))
32
125
129
33
126
130
34
=== modified file 'ibid/source/smtp.py'
35
--- ibid/source/smtp.py	2009-02-23 20:29:44 +0000
36
+++ ibid/source/smtp.py	2009-03-16 21:15:23 +0000
37
@@ -54,13 +54,13 @@
38
54
        event = Event(self.name, u'message')
54
        event = Event(self.name, u'message')
39
55
        (realname, address) = parseaddr(mail['from'])
55
        (realname, address) = parseaddr(mail['from'])
40
56
        event.channel = event.sender['connection'] = event.sender['id'] = unicode(address, 'utf-8', 'replace')
56
        event.channel = event.sender['connection'] = event.sender['id'] = unicode(address, 'utf-8', 'replace')
42
57
        event.sender['nick'] = realname != '' and unicode(realname, 'utf-8', 'replace') or address
57
        event.sender['nick'] = realname != '' and unicode(realname, 'utf-8', 'replace') or event.channel
43
58
        event.public = False
58
        event.public = False
44
59
        event.addressed = True
59
        event.addressed = True
45
60
        event.subject = unicode(mail['subject'], 'utf-8', 'replace')
60
        event.subject = unicode(mail['subject'], 'utf-8', 'replace')
46
61
        event.headers = dict((i[0], unicode(i[1], 'utf-8', 'replace')) for i in mail.items())
61
        event.headers = dict((i[0], unicode(i[1], 'utf-8', 'replace')) for i in mail.items())
47
62
62
49
63
        message = mail.is_multipart() and mail.get_payload()[0] or mail.get_payload()
63
        message = mail.is_multipart() and mail.get_payload()[0].get_payload() or mail.get_payload()
50
64
        if len(message) > 0:
64
        if len(message) > 0:
51
65
            event.message = stripsig.sub('', message).strip().replace('\n', ' ')
65
            event.message = stripsig.sub('', message).strip().replace('\n', ' ')
52
66
        else:
66
        else:
Reviewer	Date Requested	Status
Stefano Rivera		Approve on 2009-03-16
Jonathan Hitchcock	2009-03-16	Approve on 2009-03-16
Review via email: mp+4551@code.launchpad.net