* src/GrampsCfg.py: Add comment about SUSE naming of gconf
* src/Relationship.py: detect a RuntimeError exception that occurs when we exceed the recursion depth limit. This occurs when a relationship loop is detected * src/gramps_main.py: handle relationship loop message svn: r2355
This commit is contained in:
parent
06cab2d559
commit
0b96a875df
@ -42,6 +42,9 @@ import gtk.glade
|
|||||||
import gnome
|
import gnome
|
||||||
import gnome.ui
|
import gnome.ui
|
||||||
|
|
||||||
|
#
|
||||||
|
# SUSE calls the gconf module "gnome.gconf"
|
||||||
|
#
|
||||||
try:
|
try:
|
||||||
import gconf
|
import gconf
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -218,8 +218,11 @@ def get_relationship(orig_person,other_person):
|
|||||||
if is_spouse(orig_person,other_person):
|
if is_spouse(orig_person,other_person):
|
||||||
return ("spouse",[])
|
return ("spouse",[])
|
||||||
|
|
||||||
apply_filter(orig_person,0,firstList,firstMap)
|
try:
|
||||||
apply_filter(other_person,0,secondList,secondMap)
|
apply_filter(orig_person,0,firstList,firstMap)
|
||||||
|
apply_filter(other_person,0,secondList,secondMap)
|
||||||
|
except RuntimeError,msg:
|
||||||
|
return (_("Relationship loop detected"),None)
|
||||||
|
|
||||||
for person in firstList:
|
for person in firstList:
|
||||||
if person in secondList:
|
if person in secondList:
|
||||||
|
@ -1366,8 +1366,11 @@ class Gramps:
|
|||||||
self.active_person)
|
self.active_person)
|
||||||
|
|
||||||
if name:
|
if name:
|
||||||
return _("%(relationship)s of %(person)s") % {
|
if plist == None:
|
||||||
'relationship' : name, 'person' : pname }
|
return name
|
||||||
|
else:
|
||||||
|
return _("%(relationship)s of %(person)s") % {
|
||||||
|
'relationship' : name, 'person' : pname }
|
||||||
else:
|
else:
|
||||||
return ""
|
return ""
|
||||||
except:
|
except:
|
||||||
|
Loading…
Reference in New Issue
Block a user