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

sync --content: Fix bug that caused transfers of files to be made to a git remote that does not have a UUID. This particularly impacted clones from gcrypt repositories.

Browse source 
Added guard in Annex.Transfer to prevent this problem at a deeper level.

I'm unhappy ith NoUUID, but having Maybe UUID instead wouldn't help either
if nothing checked that there was a UUID. Since there legitimately need to
be Remotes that do not have a UUID, I can't see a way to fix it at the type
level, short making there be two separate types of Remotes.
This commit is contained in:
Joey Hess 2016-06-02 13:50:05 -04:00
parent abf28714c3
commit fbf5045d4f
Failed to extract signature
5 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Annex/Transfer.hs
View file

@ -46,10 +46,17 @@ noObserver :: TransferObserver
noObserver _ _ _ = noop
upload :: Observable v => UUID -> Key -> AssociatedFile -> RetryDecider -> TransferObserver -> (MeterUpdate -> Annex v) -> NotifyWitness -> Annex v
upload u key f d o a _witness = runTransfer (Transfer Upload u key) f d o a
upload u key f d o a _witness = guardHaveUUID u $
runTransfer (Transfer Upload u key) f d o a
download :: Observable v => UUID -> Key -> AssociatedFile -> RetryDecider -> TransferObserver -> (MeterUpdate -> Annex v) -> NotifyWitness -> Annex v
download u key f d o a _witness = runTransfer (Transfer Download u key) f d o a
download u key f d o a _witness = guardHaveUUID u $
runTransfer (Transfer Download u key) f d o a
guardHaveUUID :: Observable v => UUID -> Annex v -> Annex v
guardHaveUUID u a
| u == NoUUID = return observeFailure
| otherwise = a
{- Runs a transfer action. Creates and locks the lock file while the
- action is running, and stores info in the transfer information