Skip to content

Commit a2995c7

Browse files
author
Richard Jones
committed
couple of bugfixes
1 parent bbc7441 commit a2995c7

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

CHANGES.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ Feature:
77
- added support for HTTP charset selection
88
- implement __nonzero__ for HTMLProperty
99

10+
2004-??-?? 0.7.5
11+
Fixed:
12+
- re-acquire the OTK manager when we re-open the database
13+
- mailgw handler can close the database on us
14+
15+
16+
2004-05-28 0.7.4
17+
Fixed:
18+
- remove "manual" locking of sqlite database
19+
- create a new RDBMS cursor after committing
20+
1021

1122
2004-05-28 0.7.3
1223
Fixed:

doc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ Terrel Shumway,
124124
Emil Sit,
125125
Alexander Smishlajev,
126126
Nathaniel Smith,
127+
Mitchell Surface,
127128
Mike Thompson,
128129
Darryl VanDorp,
129130
J Vickroy.

roundup/cgi/actions.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#$Id: actions.py,v 1.29 2004-05-23 23:24:47 richard Exp $
1+
#$Id: actions.py,v 1.30 2004-05-28 00:56:50 richard Exp $
22

33
import re, cgi, StringIO, urllib, Cookie, time, random
44

@@ -575,6 +575,7 @@ def handle(self):
575575
if self.user != 'admin':
576576
self.client.opendb('admin')
577577
self.db = self.client.db
578+
otks = self.db.getOTKManager()
578579

579580
# change the password
580581
newpw = password.generatePassword()

roundup/scripts/roundup_mailgw.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1515
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1616
#
17-
# $Id: roundup_mailgw.py,v 1.17 2004-05-18 19:26:32 a1s Exp $
17+
# $Id: roundup_mailgw.py,v 1.18 2004-05-28 00:56:50 richard Exp $
1818

1919
"""Command-line script stub that calls the roundup.mailgw.
2020
"""
@@ -174,7 +174,8 @@ def main(argv):
174174
return usage(argv, _('Error: The source must be either "mailbox",'
175175
' "pop", "apop", "imap" or "imaps"'))
176176
finally:
177-
db.close()
177+
# handler might have closed the initial db and opened a new one
178+
handler.db.close()
178179

179180
def run():
180181
# time out after a minute if we can

0 commit comments

Comments
 (0)