~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2009-12-21 18:50:59 UTC
mfrom: (4634.113.4 2.0.4-495000-win32-autopack)
mto: (4634.119.1 2.0) (4927.1.1 merge-2.0-into-devel) (4931.1.2 jam-integration) (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 4928.
Revision ID: pqm@pqm.ubuntu.com-20091221185059-vuinz3m0zbxvsh49

(jam) Fix part of bug #495000 so that 2a formats restart concurrent
autopack as appropriate.

added added

removed removed

352

"""Build a VersionedFiles instance on top of this group of packs."""

353

index_name = index_name + '_index'

354

index_to_pack = {}

355

access = knit._DirectPackAccess(index_to_pack)

355

access = knit._DirectPackAccess(index_to_pack,

356

reload_func=self._reload_func)

356

357

if for_write:

357

358

# Use new_pack

358

359

if self.new_pack is None: