mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

migrate: Don't fall over a stale temp file.

Browse source
This commit is contained in:
Joey Hess 2011-11-17 18:29:28 -04:00
parent 8b892901a9
commit c70b78d40a
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Command/Migrate.hs
View file

@ -48,9 +48,10 @@ perform file oldkey newbackend = do
src <- fromRepo $ gitAnnexLocation oldkey src <- fromRepo $ gitAnnexLocation oldkey
tmp <- fromRepo gitAnnexTmpDir tmp <- fromRepo gitAnnexTmpDir
let tmpfile = tmp </> takeFileName file let tmpfile = tmp </> takeFileName file
cleantmp tmpfile
liftIO $ createLink src tmpfile liftIO $ createLink src tmpfile
k <- Backend.genKey tmpfile $ Just newbackend k <- Backend.genKey tmpfile $ Just newbackend
liftIO $ cleantmp tmpfile cleantmp tmpfile
case k of case k of
Nothing -> stop Nothing -> stop
Just (newkey, _) -> do Just (newkey, _) -> do
@ -70,7 +71,7 @@ perform file oldkey newbackend = do
next $ Command.Add.cleanup file newkey True next $ Command.Add.cleanup file newkey True
else stop else stop
where where
cleantmp t = whenM (doesFileExist t) $ removeFile t cleantmp t = liftIO $ whenM (doesFileExist t) $ removeFile t
link src newkey = getViaTmpUnchecked newkey $ \t -> do link src newkey = getViaTmpUnchecked newkey $ \t -> do
-- Make a hard link to the old backend's -- Make a hard link to the old backend's
-- cached key, to avoid wasting disk space. -- cached key, to avoid wasting disk space.

1
debian/changelog vendored
View file

@ -16,6 +16,7 @@ git-annex (3.20111112) UNRELEASED; urgency=low
* Fix support for insteadOf url remapping. Closes: #644278 * Fix support for insteadOf url remapping. Closes: #644278
* When not run in a git repository, git-annex can still display a usage * When not run in a git repository, git-annex can still display a usage
message, and "git annex version" even works. message, and "git annex version" even works.
* migrate: Don't fall over a stale temp file.
-- Joey Hess <joeyh@debian.org> Sat, 12 Nov 2011 14:50:21 -0400 -- Joey Hess <joeyh@debian.org> Sat, 12 Nov 2011 14:50:21 -0400

4
doc/bugs/interrupting_migration_causes_problems.mdwn
View file

@ -47,4 +47,6 @@ The error:
failed failed
git-annex: migrate: 1 failed git-annex: migrate: 1 failed
> Fixed it to delete the stale temp file. [[done]]
>
> Thanks for making such clear test cases, Jim! --[[Joey]]