diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-06-09 16:38:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-09 16:38:47 -0400 |
| commit | bc0d6a9c54a41e1955028499fc1fdaf4f4ce2650 (patch) | |
| tree | 15ec883fe185bf3e4f63da2c0d388507968e9660 | |
| parent | 1b621760c062c666f89e7fee0df689dcea9c6c79 (diff) | |
filter out NoUUID remotes from syncDataRemotes
| -rw-r--r-- | Assistant/DaemonStatus.hs | 1 | ||||
| -rw-r--r-- | doc/bugs/__34__metadata_only__34___git-remote-gcrypt_syncing_files_anyway/comment_3_79268506a1653220ddfbb45f9c61d8a7._comment | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index 4c42ffdbe..92aad0735 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -55,6 +55,7 @@ calcSyncRemotes = do let good r = Remote.uuid r `elem` alive let syncable = filter good rs let syncdata = filter (not . remoteAnnexIgnore . Remote.gitconfig) $ + filter (\r -> Remote.uuid r /= NoUUID) $ filter (not . Remote.isXMPPRemote) syncable return $ \dstatus -> dstatus diff --git a/doc/bugs/__34__metadata_only__34___git-remote-gcrypt_syncing_files_anyway/comment_3_79268506a1653220ddfbb45f9c61d8a7._comment b/doc/bugs/__34__metadata_only__34___git-remote-gcrypt_syncing_files_anyway/comment_3_79268506a1653220ddfbb45f9c61d8a7._comment new file mode 100644 index 000000000..e24cb210b --- /dev/null +++ b/doc/bugs/__34__metadata_only__34___git-remote-gcrypt_syncing_files_anyway/comment_3_79268506a1653220ddfbb45f9c61d8a7._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2016-06-09T20:27:07Z" + content=""" +This was fixed in [[!commit fbf5045d4f17accde9e20fa528e52cb1dce61c47]] +for `git annex sync --content` + +I don't remember the immediate cause of it being in a code that that the +webapp would call, but I did add a belt-and-suspenders fix at a lower level +which I'd hope would prevent the webapp from uploading anything in any +case. + +Sounds like the webapp tries to queue transfers to a NoUUID remote, and +then presumably gives up before the object gets uploaded. + +Looking at the code, calcSyncRemotes does not filter out NoUUID remotes +when populating syncDataRemotes. So, I've fixed that too now. +"""]] |