Skip to content

Commit e0a90cc

Browse files
author
Richard Jones
committed
merge from HEAD
1 parent d5ffc66 commit e0a90cc

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

CHANGES.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
This file contains the changes to the Roundup system over time. The entries
22
are given with the most recent entry first.
33

4-
2004-06-10 0.7.5
4+
2004-??-?? 0.7.5
55
Fixed:
66
- force lookup of journal props in anydbm filtering
7+
- fixed lookup of "missing" Link values for new props in anydbm backend
78

89

910
2004-06-10 0.7.4

roundup/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1717
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1818
#
19-
# $Id: admin.py,v 1.68 2004-04-17 01:47:37 richard Exp $
19+
# $Id: admin.py,v 1.68.2.1 2004-06-13 00:40:55 richard Exp $
2020

2121
'''Administration commands for maintaining Roundup trackers.
2222
'''

roundup/backends/back_anydbm.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
#$Id: back_anydbm.py,v 1.146.2.7 2004-06-10 06:58:03 richard Exp $
18+
#$Id: back_anydbm.py,v 1.146.2.8 2004-06-13 00:40:55 richard Exp $
1919
'''This module defines a backend that saves the hyperdatabase in a
2020
database chosen by anydbm. It is guaranteed to always be available in python
2121
versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1471,12 +1471,16 @@ def find(self, **propspec):
14711471
if item.has_key(self.db.RETIRED_FLAG):
14721472
continue
14731473
for propname, itemids in propspec:
1474-
# can't test if the item doesn't have this property
1475-
if not item.has_key(propname):
1476-
continue
14771474
if type(itemids) is not type({}):
14781475
itemids = {itemids:1}
14791476

1477+
# special case if the item doesn't have this property
1478+
if not item.has_key(propname):
1479+
if itemids.has_key(None):
1480+
l.append(id)
1481+
break
1482+
continue
1483+
14801484
# grab the property definition and its value on this item
14811485
prop = self.properties[propname]
14821486
value = item[propname]

0 commit comments

Comments
 (0)