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

Fix error handling when merging people

Browse Source 
svn: r15675
This commit is contained in:
Nick Hall 2010-08-01 18:18:29 +00:00
parent 12e174b7f3
commit 2bece278c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Merge/mergeperson.py
View File

@ -335,8 +335,8 @@ class MergePeople(ManagedWindow.ManagedWindow):
try: try:
query = MergePersonQuery(self.dbstate, phoenix, titanic) query = MergePersonQuery(self.dbstate, phoenix, titanic)
query.execute() query.execute()
except MergeError, errstr: except MergeError, err:
ErrorDialog( _("Cannot merge people"), errstr) ErrorDialog( _("Cannot merge people"), str(err))
self.uistate.viewmanager.active_page.selection.unselect_path( self.uistate.viewmanager.active_page.selection.unselect_path(
unselect_path) unselect_path)
self.uistate.set_busy_cursor(False) self.uistate.set_busy_cursor(False)