summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-10-06 17:11:52 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-10-06 17:11:52 -0400
commit0dad31a69828cddbd5f402e6b18b1d70e8711a86 (patch)
tree01aaae1ab6d9d240a5ab03dda5860274825da00b
parent2c5f4a4f4783795907df66edeb1a57585f570feb (diff)
analysis
-rw-r--r--Logs/PreferredContent.hs9
-rw-r--r--doc/bugs/git_annex_preferred_content_strange_behavior/comment_3_51849db15fdd2b79a82f6eba86479134._comment12
2 files changed, 19 insertions, 2 deletions
diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs
index c21d67010..1e631f86e 100644
--- a/Logs/PreferredContent.hs
+++ b/Logs/PreferredContent.hs
@@ -57,8 +57,13 @@ checkMap getmap mu notpresent mkey afile d = do
u <- maybe getUUID return mu
m <- getmap
case M.lookup u m of
- Nothing -> return d
- Just matcher -> checkMatcher matcher mkey afile notpresent d
+ Nothing -> do
+ liftIO $ print ("default for", u, d)
+ return d
+ Just matcher -> do
+ r <- checkMatcher matcher mkey afile notpresent d
+ liftIO $ print ("checking for ", u, r)
+ return r
preferredContentMap :: Annex (FileMatcherMap Annex)
preferredContentMap = maybe (fst <$> preferredRequiredMapsLoad) return
diff --git a/doc/bugs/git_annex_preferred_content_strange_behavior/comment_3_51849db15fdd2b79a82f6eba86479134._comment b/doc/bugs/git_annex_preferred_content_strange_behavior/comment_3_51849db15fdd2b79a82f6eba86479134._comment
new file mode 100644
index 000000000..680429841
--- /dev/null
+++ b/doc/bugs/git_annex_preferred_content_strange_behavior/comment_3_51849db15fdd2b79a82f6eba86479134._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2015-10-06T21:10:44Z"
+ content="""
+Intriguingly, debugging shows it's checking the preferred content of
+the repo it's in, rather than of the repo it's copying to!
+
+And indeed, git-annex sync --content doesn't copy the file to B.
+So, this bug is in `git-annex copy --to --auto`, and not in preferred
+content handling in general.
+"""]]