openstack
/
freezer
Code Issues Proposed changes

Fix restore bug 

Fix bad merge in which metadata code was added to
stable/mitaka release.

Change-Id: Ibaf25a1ae9e5816ace1a55162d8d2dffaffe9040
Closes-Bug: #1604605
This commit is contained in:
Deklan Dieterly 2016-07-19 16:34:00 -06:00
parent 1bc313b53b
commit 67ac05afc7
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freezer/engine/tar/tar_engine.py
View File

@ -89,13 +89,9 @@ class TarBackupEngine(engine.BackupEngine):
try:
metadata = backup.metadata()
if not self.encrypt_pass_file and metadata.get("encryption", False):
raise Exception("Cannot restore encrypted backup without key")
tar_command = tar_builders.TarCommandRestoreBuilder(
restore_path,
metadata.get('compression', self.compression_algo),
self.compression_algo,
self.is_windows)
if self.encrypt_pass_file: