summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-01-22 07:10:24 +1100
committerGravatar Joey Hess <joey@kitenet.net>2013-01-22 07:10:24 +1100
commit98fcb8d3516b14c3bc1cb5acc7d5ade6bff5c9ec (patch)
tree29f173520a926ec5c5b8a5d99882ed20b1bb9f75
parent97d585a3ff063f4d77374cfe28c91f65a25a76e5 (diff)
adjust archive exclusion
-rw-r--r--Types/StandardGroups.hs2
-rw-r--r--doc/preferred_content.mdwn2
2 files changed, 2 insertions, 2 deletions
diff --git a/Types/StandardGroups.hs b/Types/StandardGroups.hs
index 5be5fa8b7..a8ac89b4e 100644
--- a/Types/StandardGroups.hs
+++ b/Types/StandardGroups.hs
@@ -53,4 +53,4 @@ preferredContent BackupGroup = "include=*"
preferredContent SmallArchiveGroup = "(include=*/archive/* or include=archive/*) and " ++ preferredContent FullArchiveGroup
preferredContent FullArchiveGroup = "not (copies=archive:1 or copies=smallarchive:1)"
preferredContent SourceGroup = "not (copies=1)"
-preferredContent ManualGroup = "present and exclude=archive/*"
+preferredContent ManualGroup = "present and exclude=*/archive/* and exclude=archive/*"
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index 1def63b6d..f87dd6655 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -148,4 +148,4 @@ local copy of every file. Instead, you can manually run `git annex get`,
Only content that is present is preferred. Content in "archive"
directories is never preferred.
-`present and exclude=archive/*`
+`present and exclude=*/archive/* and exclude=archive/*`