merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -9,6 +9,7 @@ Fixed:
 - fix (list) popup (sf bug 1083570)
 - fix some security assertions (sf bug 1085481)
 - 'roundup-server -S' always writes [trackers] section heading (sf bug 1088878)
+- fix port number as int in mysql connection info (sf bug 1082530)
 
 
 2004-12-08 0.8.0b1

doc/index.txt

@@ -91,6 +91,7 @@ Gus Gollings,
 Dan Grassi,
 Robin Green,
 Engelbert Gruber,
+Bruce Guenter,
 Juergen Hermann,
 Uwe Hoffmann,
 Tobias Hunger,

roundup/backends/back_mysql.py

@@ -44,6 +44,8 @@ def connection_dict(config, dbnamestr=None):
     if d.has_key('password'):
         d['passwd'] = d['password']
         del d['password']
+    if d.has_key('port'):
+        d['port'] = int(d['port'])
     return d
 
 def db_nuke(config):

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.159 2004-11-17 22:16:29 richard Exp $
+$Id: mailgw.py,v 1.159.2.1 2005-01-03 02:53:41 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -845,8 +845,10 @@ def handle_message(self, message):
 
 
         # set the issue title to the subject
-        if properties.has_key('title') and not issue_props.has_key('title'):
-            issue_props['title'] = title.strip()
+        title = title.strip()
+        if (title and properties.has_key('title') and not
+                issue_props.has_key('title')):
+            issue_props['title'] = title
 
         #
         # handle message-id and in-reply-to