=== modified file 'processors/generic_processor.py' --- processors/generic_processor.py 2012-02-28 14:00:56 +0000 +++ processors/generic_processor.py 2012-11-03 07:13:13 +0000 @@ -25,9 +25,12 @@ progress, ) try: - from bzrlib.repofmt.knitpack_repo import KnitPackRepository + from bzrlib.repofmt.pack_repo import PackRepository except ImportError: - from bzrlib.repofmt.pack_repo import KnitPackRepository + try: + from bzrlib.repofmt.knitpack_repo import KnitPackRepository + except ImportError: + from bzrlib.repofmt.pack_repo import KnitPackRepository from bzrlib.trace import ( mutter, note, @@ -175,7 +178,7 @@ # Disable autopacking if the repo format supports it. # THIS IS A HACK - there is no sanctioned way of doing this yet. - if isinstance(self.repo, KnitPackRepository): + if isinstance(self.repo, PackRepository): self._original_max_pack_count = \ self.repo._pack_collection._max_pack_count def _max_pack_count_for_import(total_revisions):