[holland] Added Patch0: holland-1.0.6-bug706997.patch which resolves LP#706997 purge-policy = before-backup

[derks]

commit eee761595bbf28c1187108507b6356e77dfdb059
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Mon Jan 24 11:49:10 2011 -0600

    Added Patch0: holland-1.0.6-bug706997.patch which resolves
      LP#706997 purge-policy = before-backup problem

 holland-1.0.6-bug706997.patch |   23 +++++++++++++++++++++++
 holland.spec                  |   11 ++++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/holland-1.0.6-bug706997.patch b/holland-1.0.6-bug706997.patch
new file mode 100644
index 0000000..9087650
--- /dev/null
+++ b/holland-1.0.6-bug706997.patch
@@ -0,0 +1,23 @@
+Resolves https://bugs.launchpad.net/holland-backup/+bug/706997
+
+--- holland-1.0.6/holland/commands/backup.py.orig	2011-01-12 13:27:16.000000000 -0600
++++ holland-1.0.6/holland/commands/backup.py	2011-01-24 11:41:28.454480635 -0600
+@@ -138,6 +138,8 @@
+                         "purge all backups which is probably not intended. "
+                         "Setting backups-to-keep to 1")
+             retention_count = 1
++        if event == 'pre-backup':
++            retention_count += 1
+         self.purge_backupset(backupset, retention_count)
+         backupset.update_symlinks()
+ 
+--- holland-1.0.6/holland/core/backup/base.py.orig	2011-01-12 13:27:16.000000000 -0600
++++ holland-1.0.6/holland/core/backup/base.py	2011-01-24 11:42:43.303977728 -0600
+@@ -113,6 +113,7 @@
+                              dry_run)
+ 
+         spool_entry.config['holland:backup']['start-time'] = time.time()
++        spool_entry.flush()
+         self.apply_cb('pre-backup', spool_entry)
+ 
+         try:
diff --git a/holland.spec b/holland.spec
index c9b7a41..6d4f8e5 100644
--- a/holland.spec
+++ b/holland.spec
@@ -35,7 +35,7 @@
 
 Name:           holland
 Version:        %{holland_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Pluggable Backup Framework
 Group:          Applications/Archiving
 License:        BSD 
@@ -55,6 +55,9 @@ Requires:       python-setuptools
 # Remove if the -random subpackage is re-enabled.
 Obsoletes:      %{name}-random < 1.0.6
 
+Patch0:         holland-1.0.6-bug706997.patch
+
+
 %description
 A pluggable backup framework which focuses on, but is not limited to, highly
 configurable database backups.
@@ -182,6 +185,8 @@ backup tool for InnoDB and XtraDB engines for MySQL
 
 %prep
 %setup -q
+%patch0 -p1 -b .bug706997
+
 find ./ -name setup.cfg -exec rm -f {} \;
 mv plugins/README README.plugins
 mv config/providers/README README.providers 
@@ -522,6 +527,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Jan 24 2011 BJ Dierkes <wdierkes at rackspace.com> - 1.0.6-3
+- Added Patch0: holland-1.0.6-bug706997.patch which resolves
+  LP#706997 purge-policy = before-backup problem
+
 * Thu Jan 13 2011 BJ Dierkes <wdierkes at rackspace.com> - 1.0.6-2
 - Remove Requires: xtrabackup from holland-xtrabackup.  Fedora
   doesn't provide xtrabackup currently, however there are solutions