merge from maint-0-8

Author: Richard Jones

CHANGES.txt

@@ -11,6 +11,7 @@ Feature:
 2005-??-?? 0.8.4
 Fixed:
 - extra CRs in CSV export files on Windows platform (sf bug 1195742)
+- activity RDBMS columns were being reported in changes
 
 
 2005-05-02 0.8.3

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.154 2005-05-02 05:48:59 richard Exp $
+# $Id: rdbms_common.py,v 1.155 2005-05-18 05:21:14 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1708,9 +1708,14 @@ def set_inner(self, nodeid, **propvalues):
         propvalues['activity'] = date.Date()
         propvalues['actor'] = self.db.getuid()
 
-        # do the set, and journal it
+        # do the set
         self.db.setnode(self.classname, nodeid, propvalues, multilink_changes)
 
+        # remove the activity props now they're handled
+        del propvalues['activity']
+        del propvalues['actor']
+
+        # journal the set
         if self.do_journal:
             self.db.addjournal(self.classname, nodeid, ''"set", journalvalues)