From 90bc6e3137013c7c18fe8f1c3f843da79c74e399 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 23 Jan 2014 16:36:15 -0400 Subject: [PATCH] explicitly include unused files in backup and incremental backup include=* does not match unused files, which have no associated file. --- Types/StandardGroups.hs | 4 ++-- doc/preferred_content.mdwn | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Types/StandardGroups.hs b/Types/StandardGroups.hs index 434156a0ec..d95f28ee1b 100644 --- a/Types/StandardGroups.hs +++ b/Types/StandardGroups.hs @@ -78,9 +78,9 @@ preferredContent ClientGroup = lastResort $ "((exclude=*/archive/* and exclude=archive/*) or (" ++ notArchived ++ ")) and not unused" preferredContent TransferGroup = lastResort $ "not (inallgroup=client and copies=client:2) and (" ++ preferredContent ClientGroup ++ ")" -preferredContent BackupGroup = "include=*" +preferredContent BackupGroup = "include=* or unused" preferredContent IncrementalBackupGroup = lastResort - "include=* and (not copies=incrementalbackup:1)" + "(include=* or unused) and (not copies=incrementalbackup:1)" preferredContent SmallArchiveGroup = lastResort $ "(include=*/archive/* or include=archive/*) and (" ++ preferredContent FullArchiveGroup ++ ")" preferredContent FullArchiveGroup = lastResort notArchived diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn index 92250c034f..6d1acfb0f3 100644 --- a/doc/preferred_content.mdwn +++ b/doc/preferred_content.mdwn @@ -113,7 +113,7 @@ any repository that can will back it up.) All content is preferred, unless it's for a file in a "archive" directory, which has reached an archive repository, or is unused. -`(((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) or roughlylackingcopies=1) and not unused` +`(((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) and not unused) or roughlylackingcopies=1` ### transfer @@ -140,14 +140,14 @@ will be added later. All content is preferred. -`include=*` +`include=* or unused` ### incremental backup Only prefers content that's not already backed up to another backup or incremental backup repository. -`(include=* and (not copies=backup:1) and (not copies=incrementalbackup:1)) or approxlackingcopies=1` +`((include=* or unused) and (not copies=backup:1) and (not copies=incrementalbackup:1)) or approxlackingcopies=1` ### small archive