Skip to content

Commit 945d6bc

Browse files
author
Richard Jones
committed
add line to rego email to help URL detection [SF#906247]
1 parent 466e0a5 commit 945d6bc

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Fixed:
88
appended (so the demo tracker's template name is "classic-demo")
99
- handle bad multilink input at item creation time better (sf bug 917834)
1010
- make sure email signature starts on a newline (sf bug 919759)
11+
- add line to rego email to help URL detection (sf bug 906247)
1112

1213

1314
2004-03-01 0.6.7

demo.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Copyright (c) 2003 Richard Jones ([email protected])
44
#
5-
# $Id: demo.py,v 1.5.2.2 2004-01-08 21:24:46 richard Exp $
5+
# $Id: demo.py,v 1.5.2.3 2004-03-24 20:31:43 richard Exp $
66

77
import sys, os, string, re, urlparse
88
import shutil, socket, errno, BaseHTTPServer
@@ -21,7 +21,7 @@ def install_demo(home):
2121
except os.error, error:
2222
if error.errno != errno.ENOENT:
2323
raise
24-
init.write_select_db(home, 'anydbm')
24+
init.write_select_db(home, 'sqlite')
2525

2626
# figure basic params for server
2727
hostname = socket.gethostname()
@@ -49,6 +49,13 @@ def install_demo(home):
4949
s = f.read().replace('http://tracker.example/cgi-bin/roundup.cgi/bugs/',
5050
url)
5151
f.close()
52+
s = s + """
53+
MYSQL_DBHOST = 'localhost'
54+
MYSQL_DBUSER = 'rounduptest'
55+
MYSQL_DBPASSWORD = 'rounduptest'
56+
MYSQL_DBNAME = 'rounduptest'
57+
MYSQL_DATABASE = (MYSQL_DBHOST, MYSQL_DBUSER, MYSQL_DBPASSWORD, MYSQL_DBNAME)
58+
"""
5259
f = open(os.path.join(home, 'config.py'), 'w')
5360
f.write(s)
5461
f.close()

roundup/cgi/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: client.py,v 1.130.2.14 2004-02-26 22:20:43 richard Exp $
1+
# $Id: client.py,v 1.130.2.15 2004-03-24 20:31:43 richard Exp $
22

33
__doc__ = """
44
WWW request handler (also used in the stand-alone server).
@@ -794,6 +794,7 @@ def registerAction(self):
794794
please visit the following URL:
795795
796796
%(url)s?@action=confrego&otk=%(otk)s
797+
797798
'''%{'name': props['username'], 'tracker': tracker_name, 'url': self.base,
798799
'otk': otk}
799800
if not self.sendEmail(props['address'], subject, body):

0 commit comments

Comments
 (0)