Revision 2e8edd42 snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py

b/snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py
574 574 
        while True:
575 575 
            if node == ROOTNODE:
576 576 
                break
577 
            if recursion_depth and recursion_depth == i:
577 
            if recursion_depth and recursion_depth <= i:
578 578 
                break
579 579 
            props = self.node_get_properties(node)
580 580 
            if props is None:
......
615 615 
            filtered = filtered.where(self.versions.c.mtime < before)
616 616 
        else:
617 617 
            filtered = select([self.nodes.c.latest_version],
618 
                              self.versions.c.node == node)
618 
                              self.nodes.c.node == node)
619 619 
        s = s.where(and_(self.versions.c.cluster != except_cluster,
620 620 
                         self.versions.c.serial == filtered))
621 621 
        r = self.conn.execute(s)
......
636 636 
            c1.where(self.versions.c.node == v.c.node)
637 637 
        else:
638 638 
            c1 = select([self.nodes.c.latest_version])
639 
            c1.where(self.nodes.c.node == v.c.node)
639 
            c1 = c1.where(self.nodes.c.node == v.c.node)
640 640 
        c2 = select([self.nodes.c.node], self.nodes.c.parent == node)
641 641 
        s = s.where(and_(v.c.serial == c1,
642 642 
                         v.c.cluster != except_cluster,
......
661 661 
                        self.versions.c.node == v.c.node)
662 662 
            c1 = c1.where(self.versions.c.mtime < before)
663 663 
        else:
664 
            c1 = select([self.nodes.c.serial],
664 
            c1 = select([self.nodes.c.latest_version],
665 665 
                        self.nodes.c.node == v.c.node)
666 666 
        c2 = select([self.nodes.c.node], self.nodes.c.path.like(
667 667 
            self.escape_like(path) + '%', escape=ESCAPE_CHAR))

Also available in: Unified diff