Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backup: drop/resolve minor "TODO" comments

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-06-15 19:03:11 +02:00
parent c9a55cc198
commit 2dacb3a542
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qubes/backup.py
View File

@ -298,12 +298,7 @@ class Backup(object):
self.log = logging.getLogger('qubes.backup') self.log = logging.getLogger('qubes.backup')
# FIXME: drop this legacy feature? self.compression_filter = DEFAULT_COMPRESSION_FILTER
if isinstance(self.compressed, basestring):
self.compression_filter = self.compressed
self.compressed = True
else:
self.compression_filter = DEFAULT_COMPRESSION_FILTER
if exclude_list is None: if exclude_list is None:
exclude_list = [] exclude_list = []
@ -920,7 +915,6 @@ class ExtractWorker2(Process):
self.decryptor_process, self.decryptor_process,
self.tar2_process]: self.tar2_process]:
if process: if process:
# FIXME: kill()?
try: try:
process.terminate() process.terminate()
except OSError: except OSError:
@ -972,7 +966,6 @@ class ExtractWorker2(Process):
elif not self.tar2_process: elif not self.tar2_process:
# Extracting of the current archive failed, skip to the next # Extracting of the current archive failed, skip to the next
# archive # archive
# TODO: some debug option to preserve it?
os.remove(filename) os.remove(filename)
continue continue
else: else:
@ -1157,7 +1150,6 @@ class ExtractWorker3(ExtractWorker2):
elif not self.tar2_process: elif not self.tar2_process:
# Extracting of the current archive failed, skip to the next # Extracting of the current archive failed, skip to the next
# archive # archive
# TODO: some debug option to preserve it?
os.remove(filename) os.remove(filename)
continue continue
else: else:
@ -1652,7 +1644,6 @@ class BackupRestore(object):
"Extracting data: " + size_to_human(vms_size) + " to restore") "Extracting data: " + size_to_human(vms_size) + " to restore")
# retrieve backup from the backup stream (either VM, or dom0 file) # retrieve backup from the backup stream (either VM, or dom0 file)
# TODO: add some safety margin in vms_size?
(retrieve_proc, filelist_pipe, error_pipe) = \ (retrieve_proc, filelist_pipe, error_pipe) = \
self._start_retrieval_process(vms_dirs, limit_count, vms_size) self._start_retrieval_process(vms_dirs, limit_count, vms_size)
@ -1722,9 +1713,13 @@ class BackupRestore(object):
MAX_STDERR_BYTES))) MAX_STDERR_BYTES)))
# wait for other processes (if any) # wait for other processes (if any)
for proc in self.processes_to_kill_on_cancel: for proc in self.processes_to_kill_on_cancel:
# FIXME check 'vmproc' exit code?
proc.wait() proc.wait()
if vmproc.returncode != 0:
raise qubes.exc.QubesException(
"Backup completed, but VM receiving it reported an error "
"(exit code {})".format(vmproc.returncode))
if filename and filename != "EOF": if filename and filename != "EOF":
raise qubes.exc.QubesException( raise qubes.exc.QubesException(
"Premature end of archive, the last file was %s" % filename) "Premature end of archive, the last file was %s" % filename)