diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-06-16 17:10:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-16 17:10:10 -0400 |
| commit | 05ca2c4826371c1a9e484a887dec608be0e9c5f6 (patch) | |
| tree | 7d8c73614ecf7391154f77fe6021442f966e7365 | |
| parent | 88167b18de65eab818324de2e59a8879cce02a81 (diff) | |
Fix incremental backup standard preferred content expression to match its documentation, which says it does not want files that have reached a backup repository.
Checked history and these have been out of sync from the very beginning!
| -rw-r--r-- | Types/StandardGroups.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Types/StandardGroups.hs b/Types/StandardGroups.hs index 83e612917..11d2201e2 100644 --- a/Types/StandardGroups.hs +++ b/Types/StandardGroups.hs @@ -85,7 +85,7 @@ standardPreferredContent TransferGroup = lastResort $ "not (inallgroup=client and copies=client:2) and (" ++ standardPreferredContent ClientGroup ++ ")" standardPreferredContent BackupGroup = "include=* or unused" standardPreferredContent IncrementalBackupGroup = lastResort - "(include=* or unused) and (not copies=incrementalbackup:1)" + "(include=* or unused) and (not copies=backup:1) and (not copies=incrementalbackup:1)" standardPreferredContent SmallArchiveGroup = lastResort $ "(include=*/archive/* or include=archive/*) and (" ++ standardPreferredContent FullArchiveGroup ++ ")" standardPreferredContent FullArchiveGroup = lastResort notArchived diff --git a/debian/changelog b/debian/changelog index 5bf1b4c96..93fd3777c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,9 @@ git-annex (5.20150616) UNRELEASED; urgency=medium * sync: Add support for --all and --unused. * Added new "anything" preferred content expression, which matches all versions of all files. + * Fix incremental backup standard preferred content expression to match + its documentation, which says it does not want files that have reached + a backup repository. -- Joey Hess <id@joeyh.name> Sat, 30 May 2015 02:07:18 -0400 |