Compare commits
3 Commits
43d0e597a2
...
17a774ba7e
Author | SHA1 | Date |
---|---|---|
Dan | 17a774ba7e | |
Dan | a1d2bd173b | |
Dan | f495550ad7 |
|
@ -1,9 +0,0 @@
|
||||||
syntax: glob
|
|
||||||
*.egg-info
|
|
||||||
*.pyc
|
|
||||||
*.swp
|
|
||||||
.cache
|
|
||||||
.coverage
|
|
||||||
.tox
|
|
||||||
build
|
|
||||||
dist
|
|
40
.hgtags
40
.hgtags
|
@ -1,40 +0,0 @@
|
||||||
467d3a3ce9185e84ee51ca9156499162efd94f9a 0.0.2
|
|
||||||
7730ae34665c0dedf46deab90b32780abf6dbaff 0.0.3
|
|
||||||
4bb2e81fc77038be4499b7ea6797ab7d109460e0 0.0.4
|
|
||||||
b31d51b633701554e84f996cc0c73bad2990780b 0.0.5
|
|
||||||
b31d51b633701554e84f996cc0c73bad2990780b 0.0.5
|
|
||||||
aa8a807f4ba28f0652764ed14713ffea2fd6922d 0.0.5
|
|
||||||
aa8a807f4ba28f0652764ed14713ffea2fd6922d 0.0.5
|
|
||||||
569aef47a9b25c55b13753f94706f5d330219995 0.0.5
|
|
||||||
569aef47a9b25c55b13753f94706f5d330219995 0.0.5
|
|
||||||
a03495a8e8b471da63b5e2ae79d3ff9065839c2a 0.0.5
|
|
||||||
7ea93ca83f426ec0a608a68580c72c0775b81f86 0.0.6
|
|
||||||
cf4c7065f0711deda1cba878398bc05390e2c3f9 0.0.7
|
|
||||||
38d72677343f0a5d6845f4ac50d6778397083d45 0.1.0
|
|
||||||
ac5dfa01e9d14d09845f5e94c2c679e21c5eb2f9 0.1.1
|
|
||||||
ac5dfa01e9d14d09845f5e94c2c679e21c5eb2f9 0.1.1
|
|
||||||
7b6c87dca7ea312b2257ac1b46857b3f8c56b39c 0.1.1
|
|
||||||
83067f995dd391e38544a7722dc3b254b59c5521 0.1.2
|
|
||||||
acc7fb61566fe8028c179f43ecc735c851220b06 0.1.3
|
|
||||||
6dda59c12de88f060eb7244e6d330173985a9639 0.1.4
|
|
||||||
6dda59c12de88f060eb7244e6d330173985a9639 0.1.4
|
|
||||||
e58246fc92bb22c2b2fd8b86a1227de69d2d0315 0.1.4
|
|
||||||
0afff209b902698c2266986129d6dc9f5f913101 0.1.5
|
|
||||||
4c63f3d90ec2bf6af1714a3acec84654a7c9edf3 0.1.6
|
|
||||||
5a458ebef804be14e30d7375e3e9fbc26aedb80d 0.1.7
|
|
||||||
977f19c2f6a515be6c5ef69cf17b0e0989532209 github/yaml_config_files
|
|
||||||
0000000000000000000000000000000000000000 github/yaml_config_files
|
|
||||||
28434dd0440cc8da44c2f3e9bd7e9402a59c3b40 github/master
|
|
||||||
dbc96d3f83bd5570b6826537616d4160b3374836 0.1.8
|
|
||||||
0e1fbee9358de4f062fa9539e1355db83db70caa 1.0.0
|
|
||||||
de2d7721cdec93a52d20222a9ddd579ed93c1017 1.0.1
|
|
||||||
9603d13910b32d57a887765cab694ac5d0acc1f4 1.0.2
|
|
||||||
32c6341dda9fad77a3982641bce8a3a45821842e 1.0.3
|
|
||||||
5a003056a8ff4709c5bd4d6d33354199423f8a1d 1.1.0
|
|
||||||
7d3d11eff6c0773883c48f221431f157bc7995eb 1.1.1
|
|
||||||
f052a77a8ad5a0fea7fa86a902e0e401252f7d80 1.1.2
|
|
||||||
3f838f661546e04529b453aa443529b432afc243 1.1.3
|
|
||||||
3d605962d891731a0f372b903b556ac7a8c8359f 1.1.4
|
|
||||||
64ca13bfe050f656b44ed2eb1c3db045bfddd133 1.1.5
|
|
||||||
4daa944c122c572b9b56bfcac3f4e2869181c630 1.1.6
|
|
||||||
ec7949a14a2051616f7cdcb8e05555f02e024ae8 1.1.7
|
|
5
NEWS
5
NEWS
|
@ -1,9 +1,10 @@
|
||||||
1.1.9.dev0
|
1.1.9
|
||||||
* #16, #38: Support for user-defined hooks before/after backup, or on error.
|
* #16, #38: Support for user-defined hooks before/after backup, or on error.
|
||||||
* #33: Improve clarity of logging spew at high verbosity levels.
|
* #33: Improve clarity of logging spew at high verbosity levels.
|
||||||
* #29: Support for using tilde in source directory path to reference home directory.
|
* #29: Support for using tilde in source directory path to reference home directory.
|
||||||
* Require "prefix" in retention section when "archive_name_format" is set. This is to avoid
|
* Require "prefix" in retention section when "archive_name_format" is set. This is to avoid
|
||||||
accidental pruning of archives with a different archive name format.
|
accidental pruning of archives with a different archive name format. For similar reasons, default
|
||||||
|
"prefix" to "{hostname}-" if not specified.
|
||||||
* Convert main source repository from Mercurial to Git.
|
* Convert main source repository from Mercurial to Git.
|
||||||
* Update dead links to Borg documentation.
|
* Update dead links to Borg documentation.
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,9 @@ def _make_prune_flags(retention_config):
|
||||||
('--keep-monthly', '6'),
|
('--keep-monthly', '6'),
|
||||||
)
|
)
|
||||||
'''
|
'''
|
||||||
|
if not retention_config.get('prefix'):
|
||||||
|
retention_config['prefix'] = '{hostname}-'
|
||||||
|
|
||||||
return (
|
return (
|
||||||
('--' + option_name.replace('_', '-'), str(retention_config[option_name]))
|
('--' + option_name.replace('_', '-'), str(retention_config[option_name]))
|
||||||
for option_name, value in retention_config.items()
|
for option_name, value in retention_config.items()
|
||||||
|
|
|
@ -132,7 +132,7 @@ map:
|
||||||
desc: |
|
desc: |
|
||||||
When pruning, only consider archive names starting with this prefix.
|
When pruning, only consider archive names starting with this prefix.
|
||||||
Borg placeholders can be used. See the output of "borg help placeholders" for
|
Borg placeholders can be used. See the output of "borg help placeholders" for
|
||||||
details.
|
details. Default is "{hostname}-".
|
||||||
example: sourcehostname
|
example: sourcehostname
|
||||||
consistency:
|
consistency:
|
||||||
desc: |
|
desc: |
|
||||||
|
|
|
@ -18,7 +18,7 @@ BASE_PRUNE_FLAGS = (
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_make_prune_flags_should_return_flags_from_config():
|
def test_make_prune_flags_should_return_flags_from_config_plus_default_prefix():
|
||||||
retention_config = OrderedDict(
|
retention_config = OrderedDict(
|
||||||
(
|
(
|
||||||
('keep_daily', 1),
|
('keep_daily', 1),
|
||||||
|
@ -29,7 +29,7 @@ def test_make_prune_flags_should_return_flags_from_config():
|
||||||
|
|
||||||
result = module._make_prune_flags(retention_config)
|
result = module._make_prune_flags(retention_config)
|
||||||
|
|
||||||
assert tuple(result) == BASE_PRUNE_FLAGS
|
assert tuple(result) == BASE_PRUNE_FLAGS + (('--prefix', '{hostname}-'),)
|
||||||
|
|
||||||
|
|
||||||
def test_make_prune_flags_accepts_prefix_with_placeholders():
|
def test_make_prune_flags_accepts_prefix_with_placeholders():
|
||||||
|
|
Loading…
Reference in New Issue