From 7e3771120262d176705a78430c9cd7dbf840a1da Mon Sep 17 00:00:00 2001 From: mhagger Date: Tue, 21 Oct 2008 12:52:53 +0000 Subject: [PATCH] Generate replacement filename _before_ filenames in log messages are handled. * contrib/destroy_repository.py (FileDestroyer.destroy_file): Generate replacement filename _before_ filenames in log messages are handled. Patch by: Johan Herland git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@4622 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- contrib/destroy_repository.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/destroy_repository.py b/contrib/destroy_repository.py index 2e6fdf2c..4445a5d5 100755 --- a/contrib/destroy_repository.py +++ b/contrib/destroy_repository.py @@ -301,6 +301,7 @@ class FileDestroyer: def destroy_file(self, filename): tmp_filename = get_tmp_filename() f = open(tmp_filename, 'wb') + new_filename = rewrite_filename(filename) cvs2svn_rcsparse.parse( open(filename, 'rb'), DestroyerFilterSink( @@ -313,8 +314,7 @@ class FileDestroyer: # Replace the original file with the new one: os.remove(filename) - filename = rewrite_filename(filename) - shutil.move(tmp_filename, filename) + shutil.move(tmp_filename, new_filename) def visit(self, dirname, names): # Special handling of CVSROOT directories -- 2.11.4.GIT