Broken level for incremental backups

Resolves bug: 1555129

Change-Id: I70c4f33396af2fee517133727d64c37f6a356636
(cherry picked from commit 4db35388b8)
This commit is contained in:
eldar nugaev 2016-03-09 14:11:10 +00:00 committed by Pierre-Arthur MATHIEU
parent e615283459
commit 85a001d673
3 changed files with 4 additions and 3 deletions

View File

@ -492,7 +492,7 @@ def backup_arguments(args_dict={}):
backup_args.vssadmin = False
# Freezer version
backup_args.__dict__['__version__'] = '1.1.7'
backup_args.__dict__['__version__'] = '1.1.8'
# todo(enugaev) move it to new command line param backup_media
backup_media = 'fs'

View File

@ -274,7 +274,8 @@ class Backup:
logging.exception(e)
logging.error("cannot parse backup name: {0}"
.format(name))
backups.sort(key=lambda x: (x.timestamp, x.level))
backups.sort(
key=lambda x: (x.hostname_backup_name, x.timestamp, x.level))
zero_backups = []
""":type: list[freezer.storage.Backup]"""
last_backup = None

View File

@ -1,6 +1,6 @@
[metadata]
name = freezer
version = 1.1.7
version = 1.1.8
author = Freezer Team
author-email = openstack-dev@lists.openstack.org
summary = The OpenStack Backup Restore and Disaster Recovery as a Service Platform