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

backups: do not chdir() in main process

Browse Source 
This can be any application, for example Qubes Manager. Changing current
dir can have side effects, especially when we do not change it back
after restore (or in any error encountered).
This commit is contained in:
Marek Marczykowski-Górecki 2014-01-10 03:29:37 +01:00
parent 29bd92aad9
commit 6abca8ce57
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/backup.py
View File

@ -984,11 +984,6 @@ def backup_restore_header(source, passphrase,
if format_version == 1:
return (restore_tmpdir, os.path.join(source, 'qubes.xml'))
os.chdir(restore_tmpdir)
if BACKUP_DEBUG:
print "Working in", restore_tmpdir
# tar2qfile matches only beginnings, while tar full path
if appvm:
extract_filter = ['qubes.xml.000']
@ -1008,7 +1003,7 @@ def backup_restore_header(source, passphrase,
compressed=compressed,
appvm=appvm)
return (restore_tmpdir, "qubes.xml")
return (restore_tmpdir, os.path.join(restore_tmpdir, "qubes.xml"))
def backup_restore_prepare(backup_location, qubes_xml, passphrase, options = {},
host_collection = None, encrypt=False, appvm=None, format_version=None):