merge from HEAd

Author: Richard Jones

CHANGES.txt

@@ -8,6 +8,7 @@ Fixed:
 - fix anydbm journal import (sf bug 983166)
 - handle postgresql bug in SQL generation (sf bug 984591)
 - fix dates-from-Dates (sf bug 984604)
+- fix messageid generated when msgid is None for send_message (sf bug 987933)
 
 
 2004-06-24 0.7.5

roundup/roundupdb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundupdb.py,v 1.108 2004-04-20 05:47:33 richard Exp $
+# $Id: roundupdb.py,v 1.108.2.1 2004-07-14 01:11:37 richard Exp $
 
 """Extending hyperdb with types specific to issue-tracking.
 """
@@ -220,7 +220,8 @@ def send_message(self, nodeid, msgid, note, sendto, from_address=None,
             messageid = "<%s.%s.%s%s@%s>"%(time.time(), random.random(),
                                            self.classname, nodeid,
                                            self.db.config.MAIL_DOMAIN)
-            messages.set(msgid, messageid=messageid)
+            if msgid is not None:
+                messages.set(msgid, messageid=messageid)
 
         # compose title
         cn = self.classname