/brz/remove-bazaar : revision 4634.108.10

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Committer: Canonical.com Patch Queue Manager
Date: 2010-01-05 00:01:54 UTC
mfrom: (4634.117.3 2.0.4-update-exception-495023)
mto: (4931.1.2 jam-integration) (4634.128.1 2.0) (4932.1.4 2.1.0rc1-pyrex-propagation) (4946.1.1 2.1.0rc1-unregister-mem-trans) (4949.1.1 integration) (4953.1.1 jam-integration) (4957.1.1 jam-integration) (4964.1.1 integration) (4967.1.1 jam-integration) (4981.1.2 2.1.0rc1-dev) (4999.3.1 apport) (4797.17.1 alias-loc-docs-337834-2.1) (5051.4.1 376388-dot-bazaar-ownership) (5045.1.1 369501-version) (5346.4.1 cleanup) (5174.1.1 jam-integration) (5074.5.1 fix-523746-dev)
mto: This revision was merged to the branch mainline in revision 4933.
Revision ID: pqm@pqm.ubuntu.com-20100105000154-t1mtm27efpc26gsl

(jam) Fix bug #495023, propagate exceptions from _update_current_block

added added

removed removed

1392

# provide.

1393

self.search_specific_file_parents.add('')

1394

1395

cdef void _update_current_block(self):

1395

cdef int _update_current_block(self) except -1:

1396

if (self.block_index < len(self.state._dirblocks) and

1397

osutils.is_inside(self.current_root, self.state._dirblocks[self.block_index][0])):

1398

self.current_block = self.state._dirblocks[self.block_index]

1401

else:

1402

self.current_block = None

1403

self.current_block_list = None

1404

return 0

1404

1405

1406

def __next__(self):

1406

1407

# Simple thunk to allow tail recursion without pyrex confusion