This commit is contained in:
Joey Hess 2010-10-25 20:52:03 -04:00
parent 99eaf41da5
commit 5d4ff035ba

View file

@ -436,7 +436,7 @@ moveToPerform file key = do
showNote $ show err showNote $ show err
return Nothing return Nothing
Right False -> do Right False -> do
Core.showNote $ "moving to " ++ (Git.repoDescribe r) ++ "..." Core.showNote $ "moving to " ++ (Git.repoDescribe remote) ++ "..."
let tmpfile = (annexTmpLocation remote) ++ (keyFile key) let tmpfile = (annexTmpLocation remote) ++ (keyFile key)
ok <- Remotes.copyToRemote remote key tmpfile ok <- Remotes.copyToRemote remote key tmpfile
if (ok) if (ok)
@ -479,7 +479,7 @@ moveFromPerform file key = do
if (ishere) if (ishere)
then return $ Just $ moveFromCleanup remote key then return $ Just $ moveFromCleanup remote key
else do else do
Core.showNote $ "moving from " ++ (Git.repoDescribe r) ++ "..." Core.showNote $ "moving from " ++ (Git.repoDescribe remote) ++ "..."
ok <- getViaTmp key (Remotes.copyFromRemote remote key) ok <- getViaTmp key (Remotes.copyFromRemote remote key)
if (ok) if (ok)
then return $ Just $ moveFromCleanup remote key then return $ Just $ moveFromCleanup remote key