Rev 427: Merge the bugfix for bug #602600 in http://bazaar.launchpad.net/~loggerhead-team/loggerhead/trunk-rich

[John Arbash Meinel]

At http://bazaar.launchpad.net/~loggerhead-team/loggerhead/trunk-rich

------------------------------------------------------------
revno: 427 [merge]
revision-id: john at arbash-meinel.com-20100707200944-a9k3i23ek76gyg7c
parent: jelmer at samba.org-20100530215829-cn8x1qbnsv1bxrsw
parent: john at arbash-meinel.com-20100707200738-g5o7qdqo46a49nwc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk-rich
timestamp: Wed 2010-07-07 15:09:44 -0500
message:
  Merge the bugfix for bug #602600
modified:
  loggerhead/history_db.py       history_db.py-20100331211535-afywlh5mx28fyj8x-2
-------------- next part --------------
=== modified file 'loggerhead/history_db.py'
--- a/loggerhead/history_db.py	2010-05-15 07:49:53 +0000
+++ b/loggerhead/history_db.py	2010-07-07 20:09:44 +0000
@@ -1262,7 +1262,7 @@
                              " WHERE child = c.db_id"
                              "   AND parent = p.db_id"
                              "   AND p.revision_id = ?",
-                             (revid,)).fetchall()
+                             (revision_id,)).fetchall()
         return [r[0] for r in res]
 
     def _get_lh_parent_db_id(self, revision_db_id):