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

qubes/backup: fix relative path calculation

Browse Source 
os.path.relpath strip trailing '/.' from the path, but it is important
to distinguish whole-directory archive (which is tar of '.').
This commit is contained in:
Marek Marczykowski-Górecki 2016-10-04 21:38:59 +02:00
parent ab69fdd7f4
commit 278a5340dc
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubes/backup.py
View File

@ -1026,8 +1026,8 @@ class ExtractWorker2(Process):
self.tar2_process = None self.tar2_process = None
# if that was whole-directory archive, handle # if that was whole-directory archive, handle
# relocated files now # relocated files now
inner_name = os.path.relpath( inner_name = os.path.splitext(self.tar2_current_file)[0]\
os.path.splitext(self.tar2_current_file)[0]) .replace(self.base_dir + '/', '')
if os.path.basename(inner_name) == '.': if os.path.basename(inner_name) == '.':
self.handle_dir_relocations( self.handle_dir_relocations(
os.path.dirname(inner_name)) os.path.dirname(inner_name))
@ -1051,7 +1051,8 @@ class ExtractWorker2(Process):
# next file # next file
self.cleanup_tar2(wait=True, terminate=False) self.cleanup_tar2(wait=True, terminate=False)
inner_name = os.path.relpath(filename.rstrip('.000')) inner_name = filename.rstrip('.000').replace(
self.base_dir + '/', '')
redirect_stdout = None redirect_stdout = None
if self.relocate and inner_name in self.relocate: if self.relocate and inner_name in self.relocate:
# TODO: add `dd conv=sparse` when removing tar layer # TODO: add `dd conv=sparse` when removing tar layer
@ -1210,7 +1211,8 @@ class ExtractWorker3(ExtractWorker2):
input_pipe.close() input_pipe.close()
self.cleanup_tar2(wait=True, terminate=False) self.cleanup_tar2(wait=True, terminate=False)
inner_name = os.path.relpath(filename.rstrip('.000')) inner_name = filename.rstrip('.000').replace(
self.base_dir + '/', '')
redirect_stdout = None redirect_stdout = None
if self.relocate and inner_name in self.relocate: if self.relocate and inner_name in self.relocate:
# TODO: add dd conv=sparse when removing tar layer # TODO: add dd conv=sparse when removing tar layer