# HG changeset patch
# User Richard Jones <richard@users.sourceforge.net>
# Date 1089767497 0
# Node ID 2691c4e46780b3f813d5a0bbeca61a4b18ee67ec
# Parent  5080ca961b2eca9e3f355531d8448b047c377e5d
merge from HEAd

diff -r 5080ca961b2e -r 2691c4e46780 CHANGES.txt
--- a/CHANGES.txt	Sun Jul 04 09:08:55 2004 +0000
+++ b/CHANGES.txt	Wed Jul 14 01:11:37 2004 +0000
@@ -8,6 +8,7 @@
 - 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
diff -r 5080ca961b2e -r 2691c4e46780 roundup/roundupdb.py
--- a/roundup/roundupdb.py	Sun Jul 04 09:08:55 2004 +0000
+++ b/roundup/roundupdb.py	Wed Jul 14 01:11:37 2004 +0000
@@ -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 @@
             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