Permalink
Browse files

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.
  • Loading branch information...
1 parent fb9a42a commit dbc722499381267324394d500d0e3a302067e006 @abg abg committed Jan 30, 2013
Showing with 3 additions and 2 deletions.
  1. +3 −2 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()

0 comments on commit dbc7224

Please sign in to comment.