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

core: prevent taking database lock twice

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-02-22 01:25:51 +01:00
parent b858488719
commit ae6ca5c0a3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/qubes.py
View File

@ -602,6 +602,8 @@ class QubesVmCollection(dict):
self.save() self.save()
def lock_db_for_reading(self): def lock_db_for_reading(self):
if self.qubes_store_file is not None:
raise QubesException("lock already taken")
# save() would rename the file over qubes.xml, _then_ release lock, # save() would rename the file over qubes.xml, _then_ release lock,
# so we need to ensure that the file for which we've got the lock is # so we need to ensure that the file for which we've got the lock is
# still the right file # still the right file
@ -620,6 +622,8 @@ class QubesVmCollection(dict):
self.qubes_store_file.close() self.qubes_store_file.close()
def lock_db_for_writing(self): def lock_db_for_writing(self):
if self.qubes_store_file is not None:
raise QubesException("lock already taken")
# save() would rename the file over qubes.xml, _then_ release lock, # save() would rename the file over qubes.xml, _then_ release lock,
# so we need to ensure that the file for which we've got the lock is # so we need to ensure that the file for which we've got the lock is
# still the right file # still the right file
@ -642,6 +646,7 @@ class QubesVmCollection(dict):
# before all buffers are flushed # before all buffers are flushed
self.log.debug('unlock_db()') self.log.debug('unlock_db()')
self.qubes_store_file.close() self.qubes_store_file.close()
self.qubes_store_file = None
def save(self): def save(self):
self.log.debug('save()') self.log.debug('save()')