[35106] trunk/dports/devel/trac

[dluke at macports.org]

Revision: 35106
          http://trac.macosforge.org/projects/macports/changeset/35106
Author:   dluke at macports.org
Date:     2008-03-17 08:55:21 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Patch for postgres8.3 compatibility. Fixes #14680

Modified Paths:
--------------
    trunk/dports/devel/trac/Portfile

Added Paths:
-----------
    trunk/dports/devel/trac/files/
    trunk/dports/devel/trac/files/patch-trac_ticket_model.py.diff
    trunk/dports/devel/trac/files/patch-trac_versioncontrol_cache.py.diff

Modified: trunk/dports/devel/trac/Portfile
===================================================================
--- trunk/dports/devel/trac/Portfile	2008-03-17 14:55:51 UTC (rev 35105)
+++ trunk/dports/devel/trac/Portfile	2008-03-17 15:55:21 UTC (rev 35106)
@@ -5,7 +5,7 @@
 
 name			trac
 version			0.10.4
-revision		1
+revision		2
 categories		devel python
 platforms		darwin
 maintainers		dluke at geeklair.net
@@ -19,6 +19,9 @@
 distname	trac-${version}
 checksums	md5 52a3a21ad9faafc3b59cbeb87d5a69d2
 
+patchfiles	patch-trac_ticket_model.py.diff \
+		patch-trac_versioncontrol_cache.py.diff
+
 depends_lib	port:subversion-python25bindings port:clearsilver \
 		port:py25-sqlite3 port:python25 \
 		port:sqlite3 port:py25-hashlib

Added: trunk/dports/devel/trac/files/patch-trac_ticket_model.py.diff
===================================================================
--- trunk/dports/devel/trac/files/patch-trac_ticket_model.py.diff	                        (rev 0)
+++ trunk/dports/devel/trac/files/patch-trac_ticket_model.py.diff	2008-03-17 15:55:21 UTC (rev 35106)
@@ -0,0 +1,20 @@
+--- trac/ticket/model.py.orig	2007-04-20 07:41:46.000000000 -0600
++++ trac/ticket/model.py	2008-03-15 17:45:40.000000000 -0600
+@@ -283,7 +283,7 @@
+                            "SELECT time,author,'comment',null,description,0 "
+                            "FROM attachment WHERE id=%s AND time=%s "
+                            "ORDER BY time",
+-                           (self.id, when, str(self.id), when, self.id, when))
++                           (self.id, when, str(self.id), when, str(self.id), when))
+         else:
+             cursor.execute("SELECT time,author,field,oldvalue,newvalue,1 "
+                            "FROM ticket_change WHERE ticket=%s "
+@@ -293,7 +293,7 @@
+                            "UNION "
+                            "SELECT time,author,'comment',null,description,0 "
+                            "FROM attachment WHERE id=%s "
+-                           "ORDER BY time", (self.id,  str(self.id), self.id))
++                           "ORDER BY time", (self.id,  str(self.id), str(self.id)))
+         log = []
+         for t, author, field, oldvalue, newvalue, permanent in cursor:
+             log.append((int(t), author, field, oldvalue or '', newvalue or '',

Added: trunk/dports/devel/trac/files/patch-trac_versioncontrol_cache.py.diff
===================================================================
--- trunk/dports/devel/trac/files/patch-trac_versioncontrol_cache.py.diff	                        (rev 0)
+++ trunk/dports/devel/trac/files/patch-trac_versioncontrol_cache.py.diff	2008-03-17 15:55:21 UTC (rev 35106)
@@ -0,0 +1,20 @@
+--- trac/versioncontrol/cache.py.orig	2007-04-20 07:41:47.000000000 -0600
++++ trac/versioncontrol/cache.py	2008-03-15 17:38:28.000000000 -0600
+@@ -244,7 +244,7 @@
+         self.authz = authz
+         cursor = self.db.cursor()
+         cursor.execute("SELECT time,author,message FROM revision "
+-                       "WHERE rev=%s", (rev,))
++                       "WHERE rev=%s", (str(rev),))
+         row = cursor.fetchone()
+         if row:
+             date, author, message = row
+@@ -256,7 +256,7 @@
+         cursor = self.db.cursor()
+         cursor.execute("SELECT path,node_type,change_type,base_path,base_rev "
+                        "FROM node_change WHERE rev=%s "
+-                       "ORDER BY path", (self.rev,))
++                       "ORDER BY path", (str(self.rev),))
+         for path, kind, change, base_path, base_rev in cursor:
+             if not self.authz.has_permission(path):
+                 # FIXME: what about the base_path?

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080317/ce454782/attachment.html