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

qubesvm: don't crash VM creation if icon symlink already exists

Browse Source 
It can be leftover from previous failed attempt. Don't crash on it, and
replace it instead.

QubesOS/qubes-issues#3438
This commit is contained in:
Marek Marczykowski-Górecki 2018-10-18 00:01:45 +02:00
parent c01ae06fee
commit ba210c41ee
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/vm/qubesvm.py
View File

@ -1439,6 +1439,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
'creation'.format(self.dir_path)) 'creation'.format(self.dir_path))
raise raise
if os.path.exists(self.icon_path):
os.unlink(self.icon_path)
self.log.info('Creating icon symlink: {} -> {}'.format( self.log.info('Creating icon symlink: {} -> {}'.format(
self.icon_path, self.label.icon_path)) self.icon_path, self.label.icon_path))
if hasattr(os, "symlink"): if hasattr(os, "symlink"):