From 67590aa9215e63d8e1ce860e86699aadab446d6e Mon Sep 17 00:00:00 2001 From: Dan Christensen Date: Thu, 14 May 2015 19:34:08 -0400 Subject: [PATCH 1/3] Use --keep-monthly instead of --monthly in usage.rst --- docs/usage.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/usage.rst b/docs/usage.rst index d04b8e13c..7e57d15de 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -109,11 +109,11 @@ Examples # Keep 7 end of day, 4 additional end of week archives, # and an end of month archive for every month: - $ attic prune /data/myrepo --keep-daily=7 --keep-weekly=4 --monthly=-1 + $ attic prune /data/myrepo --keep-daily=7 --keep-weekly=4 --keep-monthly=-1 # Keep all backups in the last 10 days, 4 additional end of week archives, # and an end of month archive for every month: - $ attic prune /data/myrepo --keep-within=10d --keep-weekly=4 --monthly=-1 + $ attic prune /data/myrepo --keep-within=10d --keep-weekly=4 --keep-monthly=-1 .. include:: usage/info.rst.inc From 7b61f6aff462bee6e84e3d030627711a13eb1b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Borgstr=C3=B6m?= Date: Sat, 16 May 2015 21:35:31 +0200 Subject: [PATCH 2/3] Updated CHANGES --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 7b312a69a..574e696bf 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,7 @@ Here you can see the full list of changes between each Attic release. Version 0.16 ------------ -(bugfix release, released on X) +(bugfix release, released on May 16, 2015) - Fix typo preventing the security confirmation prompt from working (#303) - Improve handling of systems with improperly configured file system encoding (#289) - Fix "All archives" output for attic info. (#183) From 0ad2ab2496fee1c6505c68919d3838fd42b38e2c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 22 May 2015 22:55:35 +0200 Subject: [PATCH 3/3] a bit too much glob there in setup.py, removed --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index d5d548b3d..88dc2564b 100644 --- a/setup.py +++ b/setup.py @@ -35,8 +35,7 @@ try: class Sdist(versioneer.cmd_sdist): def __init__(self, *args, **kwargs): for src in glob('borg/*.pyx'): - cython_compiler.compile(glob('borg/*.pyx'), - cython_compiler.default_options) + cython_compiler.compile(src, cython_compiler.default_options) versioneer.cmd_sdist.__init__(self, *args, **kwargs) def make_distribution(self):