logic error

This commit is contained in:
Joey Hess 2012-10-14 16:21:18 -04:00
parent 8932acb5d0
commit 2d9682f3c6
2 changed files with 3 additions and 3 deletions

View file

@ -32,6 +32,6 @@ descStandardGroup BackupGroup = "backup: collects all files"
{- See doc/preferred_content.mdwn for explanations of these expressions. -} {- See doc/preferred_content.mdwn for explanations of these expressions. -}
preferredContent :: StandardGroup -> String preferredContent :: StandardGroup -> String
preferredContent ClientGroup = "exclude=*/archive/*" 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 ArchiveGroup = "not copies=archive:1"
preferredContent BackupGroup = "" -- all content is preferred preferredContent BackupGroup = "" -- all content is preferred

View file

@ -61,9 +61,9 @@ USB drive used in a sneakernet.
The preferred content expression for these causes them to get and retain The preferred content expression for these causes them to get and retain
data until all clients have a copy. 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 there is only one client repository. It makes a transfer repository
speculatively prefer content in this case, even though it as of yet speculatively prefer content in this case, even though it as of yet
has nowhere to transfer it to. Presumably, another client repository has nowhere to transfer it to. Presumably, another client repository