diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-06-03 13:15:38 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-03 13:15:38 -0400 |
| commit | a3569d07d1ba51bcf2fb75dbfa97ae999f43b803 (patch) | |
| tree | 523ee247040b4b4b8d3fe3a372289a4e2027ba55 | |
| parent | 2ec66372940a29de91e3650651362ae862120ea4 (diff) | |
import --clean-duplicates: Fix bug that didn't count local or trusted repo's copy of a file as one of the necessary copies to allow removing it from the import location.
| -rw-r--r-- | Annex/NumCopies.hs | 2 | ||||
| -rw-r--r-- | Command/Import.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/clean-duplicates_doesn__39__t_delete_duplicates.mdwn | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/Annex/NumCopies.hs b/Annex/NumCopies.hs index 879513927..3f078b8f0 100644 --- a/Annex/NumCopies.hs +++ b/Annex/NumCopies.hs @@ -95,7 +95,7 @@ verifyEnoughCopies :: String -- message to print when there are no known locations -> Key -> NumCopies - -> [UUID] -- repos to skip (generally untrusted remotes) + -> [UUID] -- repos to skip considering (generally untrusted remotes) -> [UUID] -- repos that are trusted or already verified to have it -> [Remote] -- remotes to check to see if they have it -> Annex Bool diff --git a/Command/Import.hs b/Command/Import.hs index fffa301ec..acf3bc01f 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -144,4 +144,4 @@ verifiedExisting key destfile = do (remotes, trusteduuids) <- knownCopies key untrusteduuids <- trustGet UnTrusted let tocheck = Remote.remotesWithoutUUID remotes (trusteduuids++untrusteduuids) - verifyEnoughCopies [] key need trusteduuids [] tocheck + verifyEnoughCopies [] key need [] trusteduuids tocheck diff --git a/debian/changelog b/debian/changelog index 0cc6b7a2b..3e4292b76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ git-annex (5.20150529) UNRELEASED; urgency=medium network-manager and wicd. Thanks to Sebastian Reuße for the patches. * get --incomplete: New option to resume any interrupted downloads. + * import --clean-duplicates: Fix bug that didn't count local or trusted + repo's copy of a file as one of the necessary copies to allow removing + it from the import location. -- Joey Hess <id@joeyh.name> Sat, 30 May 2015 02:07:18 -0400 diff --git a/doc/bugs/clean-duplicates_doesn__39__t_delete_duplicates.mdwn b/doc/bugs/clean-duplicates_doesn__39__t_delete_duplicates.mdwn index 30acecfb7..70a54da85 100644 --- a/doc/bugs/clean-duplicates_doesn__39__t_delete_duplicates.mdwn +++ b/doc/bugs/clean-duplicates_doesn__39__t_delete_duplicates.mdwn @@ -108,3 +108,6 @@ OS: Arch Linux # End of transcript or log. """]] + +> Indeed, I seem to have broken it while refactoring. [[fixed|done]] +> --[[Joey]] |