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

backup: fix restoring template VMs

Browse Source 
os.path.splitext fails on path without proper file base name, like
'/something/..000'. Use plain string methods (rsplit).

Fixes QubesOS/qubes-issues#3167
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-16 03:04:59 +02:00
parent 17670eae1b
commit 9cdb2a8152
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesadmin/backup/restore.py
View File

@ -630,8 +630,9 @@ class ExtractWorker3(Process):
os.remove(filename) os.remove(filename)
continue continue
else: else:
(basename, ext) = os.path.splitext(self.tar2_current_file) # os.path.splitext fails to handle 'something/..000'
previous_chunk_number = int(ext[1:]) (basename, ext) = self.tar2_current_file.rsplit('.', 1)
previous_chunk_number = int(ext)
expected_filename = basename + '.%03d' % ( expected_filename = basename + '.%03d' % (
previous_chunk_number+1) previous_chunk_number+1)
if expected_filename != filename: if expected_filename != filename: