diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-14 16:21:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-14 16:21:18 -0400 |
| commit | 93cfaa354cc6acb554332fbd6aec0391e8b9327a (patch) | |
| tree | bef6308c3dab27285e1d84257133533edb49a71e | |
| parent | dddad6181f3430f47656ff9e143cf1a0a9baddda (diff) | |
logic error
| -rw-r--r-- | Types/StandardGroups.hs | 2 | ||||
| -rw-r--r-- | doc/preferred_content.mdwn | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Types/StandardGroups.hs b/Types/StandardGroups.hs index aeae200c2..1739c2059 100644 --- a/Types/StandardGroups.hs +++ b/Types/StandardGroups.hs @@ -32,6 +32,6 @@ descStandardGroup BackupGroup = "backup: collects all files" {- See doc/preferred_content.mdwn for explanations of these expressions. -} preferredContent :: StandardGroup -> String preferredContent ClientGroup = "exclude=*/archive/*" -preferredContent TransferGroup = "not (inallgroup=client or not copies=client:2) and " ++ preferredContent ClientGroup +preferredContent TransferGroup = "not (inallgroup=client and copies=client:2) and " ++ preferredContent ClientGroup preferredContent ArchiveGroup = "not copies=archive:1" preferredContent BackupGroup = "" -- all content is preferred diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn index 6205eb4c9..d74986503 100644 --- a/doc/preferred_content.mdwn +++ b/doc/preferred_content.mdwn @@ -61,9 +61,9 @@ USB drive used in a sneakernet. The preferred content expression for these causes them to get and retain data until all clients have a copy. -`not (inallgroup=client or not copies=client:2) and exclude=*/archive/*` +`not (inallgroup=client and copies=client:2) and exclude=*/archive/*` -The "not copies=client:2" part of the above handles the case where +The "copies=client:2" part of the above handles the case where there is only one client repository. It makes a transfer repository speculatively prefer content in this case, even though it as of yet has nowhere to transfer it to. Presumably, another client repository |