Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jan 30, 2013
@abg abg fix for updating symlinks
1.0.7 introduced a regression that did not call
backupset.update_symlinks() properly when running
a manually "holland purge".  This did not affect
the "auto-purge" that usually occurs during "holland backup".
Additionally this suppresses some warnings when incorrect
validation is done of the individual backup.conf files
during the purge process.
dbc7224
@abg abg update CHANGES.txt 24b7dd1
Showing with 4 additions and 2 deletions.
  1. +1 −0  CHANGES.txt
  2. +3 −2 holland/commands/purge.py
View
1  CHANGES.txt
@@ -21,6 +21,7 @@ holland
ignored in favor of the default value for holland --log-level.
- holland mk-config now adds a default estimated-size-factor to the
[holland:backup] section.
+- holland purge now correctly updates symlinks when run manually
holland-common
++++++++++++++
View
5 holland/commands/purge.py
@@ -69,6 +69,8 @@ def run(self, cmd, opts, *backups):
error = 1
continue
purge_backup(backup, opts.force)
+ if opts.force:
+ spool.find_backupset(backup.backupset).update_symlinks()
return error
def purge_backupset(backupset, force=False, all_backups=False):
@@ -85,7 +87,7 @@ def purge_backupset(backupset, force=False, all_backups=False):
else:
try:
config = hollandcfg.backupset(backupset.name)
- config.validate_config(CONFIGSPEC)
+ config.validate_config(CONFIGSPEC, suppress_warnings=True)
except (IOError, ConfigError), exc:
LOG.error("Failed to load backupset '%s': %s", backupset.name, exc)
LOG.error("Aborting, because I could not tell how many backups to "
@@ -144,4 +146,3 @@ def purge_backup(backup, force=False):
else:
backup.purge()
LOG.info("Purged %s", backup.name)
- backup.backupset.update_symlinks()

No commit comments for this range

Something went wrong with that request. Please try again.