Rev 4475: (jam) When resuming, resume indices before pack files. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4475 [merge]
revision-id: pqm at pqm.ubuntu.com-20090623231807-lxt38nkudno0040b
parent: pqm at pqm.ubuntu.com-20090623152750-ecuv25e1te21w2pc
parent: john at arbash-meinel.com-20090623144445-soj2t4nzdny5z3b0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-06-24 00:18:07 +0100
message:
  (jam) When resuming, resume indices before pack files.
modified:
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2009-06-22 04:56:21 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2009-06-23 14:44:45 +0000
@@ -313,8 +313,6 @@
 
     def finish(self):
         self._check_references()
-        new_name = '../packs/' + self.file_name()
-        self.upload_transport.rename(self.file_name(), new_name)
         index_types = ['revision', 'inventory', 'text', 'signature']
         if self.chk_index is not None:
             index_types.append('chk')
@@ -323,6 +321,8 @@
             new_name = '../indices/' + old_name
             self.upload_transport.rename(old_name, new_name)
             self._replace_index_with_readonly(index_type)
+        new_name = '../packs/' + self.file_name()
+        self.upload_transport.rename(self.file_name(), new_name)
         self._state = 'finished'
 
     def _get_external_refs(self, index):