diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-03 03:52:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-03 03:52:41 -0400 |
| commit | 6543d5406c64bb00a58e74305ec9ca09a49faf0b (patch) | |
| tree | 5e33ceb3ea5b5bf5ad4f2cbb7d08b19cb1026897 /Types | |
| parent | f0dd3c6c1624cb5441eab175c6f5a683d3806885 (diff) | |
hlint
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/GitConfig.hs | 4 | ||||
| -rw-r--r-- | Types/StandardGroups.hs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index 246c320d0..ff7cd3c90 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -122,8 +122,8 @@ extractRemoteGitConfig r remotename = RemoteGitConfig getbool k def = fromMaybe def $ getmaybebool k getmaybebool k = Git.Config.isTrue =<< getmaybe k getmayberead k = readish =<< getmaybe k - getmaybe k = maybe (Git.Config.getMaybe (key k) r) Just $ - Git.Config.getMaybe (remotekey k) r + getmaybe k = mplus (Git.Config.getMaybe (key k) r) + (Git.Config.getMaybe (remotekey k) r) getoptions k = fromMaybe [] $ words <$> getmaybe k key k = "annex." ++ k diff --git a/Types/StandardGroups.hs b/Types/StandardGroups.hs index 2262c3bde..434600f3f 100644 --- a/Types/StandardGroups.hs +++ b/Types/StandardGroups.hs @@ -57,17 +57,17 @@ descStandardGroup UnwantedGroup = "unwanted: remove content from this repository preferredContent :: StandardGroup -> String preferredContent ClientGroup = lastResort "exclude=*/archive/* and exclude=archive/*" -preferredContent TransferGroup = lastResort $ +preferredContent TransferGroup = lastResort "not (inallgroup=client and copies=client:2) and " ++ preferredContent ClientGroup preferredContent BackupGroup = "include=*" -preferredContent IncrementalBackupGroup = lastResort $ +preferredContent IncrementalBackupGroup = lastResort "include=* and (not copies=incrementalbackup:1)" preferredContent SmallArchiveGroup = lastResort $ "(include=*/archive/* or include=archive/*) and " ++ preferredContent FullArchiveGroup -preferredContent FullArchiveGroup = lastResort $ +preferredContent FullArchiveGroup = lastResort "not (copies=archive:1 or copies=smallarchive:1)" preferredContent SourceGroup = "not (copies=1)" -preferredContent ManualGroup = lastResort $ +preferredContent ManualGroup = lastResort "present and exclude=*/archive/* and exclude=archive/*" preferredContent UnwantedGroup = "exclude=*" |