Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-06-20 Don Allingham <don@gramps-project.org>

Browse Source 
* src/DbManager.py: Catch the icons properly
	* src/GrampsDb/_GrampsDBDir.py: catch error on lock file deletion



svn: r8617
This commit is contained in:
Don Allingham 2007-06-21 04:55:26 +00:00
parent 3f062375f5
commit dfa46b7af4
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-06-20 Don Allingham <don@gramps-project.org>
* src/DbManager.py: Catch the icons properly
* src/GrampsDb/_GrampsDBDir.py: catch error on lock file deletion
2007-06-20 Alex Roitman <shura@gramps-project.org> 2007-06-20 Alex Roitman <shura@gramps-project.org>
* src/Config/_GrampsConfigKeys.py: Correctly regenerate. * src/Config/_GrampsConfigKeys.py: Correctly regenerate.
* src/DbManager.py (__rcs): Typo. * src/DbManager.py (__rcs): Typo.

3
src/DbManager.py
View File

@ -192,7 +192,7 @@ class DbManager:
self.rcs.set_label(_("Archive")) self.rcs.set_label(_("Archive"))
self.rename.set_sensitive(True) self.rename.set_sensitive(True)
if store.get_value(node, OPEN_COL): if store.get_value(node, STOCK_COL) == gtk.STOCK_OPEN:
self.connect.set_sensitive(False) self.connect.set_sensitive(False)
if _rcs_found: if _rcs_found:
self.rcs.show() self.rcs.show()
@ -202,6 +202,7 @@ class DbManager:
self.rcs.show() self.rcs.show()
else: else:
self.rcs.hide() self.rcs.hide()
if store.get_value(node, STOCK_COL) == gtk.STOCK_DIALOG_ERROR: if store.get_value(node, STOCK_COL) == gtk.STOCK_DIALOG_ERROR:
path = store.get_value(node, PATH_COL) path = store.get_value(node, PATH_COL)
if os.path.isfile(os.path.join(path,"person.gbkp")): if os.path.isfile(os.path.join(path,"person.gbkp")):

5
src/GrampsDb/_GrampsDBDir.py
View File

@ -1729,7 +1729,10 @@ def _mkname(path, name):
return os.path.join(path, name + ".db") return os.path.join(path, name + ".db")
def clear_lock_file(name): def clear_lock_file(name):
os.unlink(os.path.join(name, "lock")) try:
os.unlink(os.path.join(name, "lock"))
except OSError:
return
def write_lock_file(name): def write_lock_file(name):
f = open(os.path.join(name, "lock"), "w") f = open(os.path.join(name, "lock"), "w")