* src/DisplayTrace.py: identify more linux versions
svn: r1803
This commit is contained in:
parent
eb1a9a234f
commit
06e08a27c4
@ -45,10 +45,14 @@ import const
|
|||||||
from intl import gettext as _
|
from intl import gettext as _
|
||||||
|
|
||||||
_release_files = [
|
_release_files = [
|
||||||
"/etc/redhat-release",
|
|
||||||
"/etc/mandrake-release",
|
"/etc/mandrake-release",
|
||||||
|
"/etc/redhat-release",
|
||||||
|
"/etc/turbolinux-release",
|
||||||
|
"/etc/debian-version",
|
||||||
|
"/etc/environment.corel",
|
||||||
"/etc/debian-release",
|
"/etc/debian-release",
|
||||||
"/etc/SuSE-release",
|
"/etc/SuSE-release",
|
||||||
|
"/etc/slackware-release",
|
||||||
"/etc/gentoo-release",
|
"/etc/gentoo-release",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -73,6 +77,7 @@ class DisplayTrace:
|
|||||||
msg.write("LANG : %s\n" % os.environ['LANG'])
|
msg.write("LANG : %s\n" % os.environ['LANG'])
|
||||||
msg.write("Python : %s.%s.%s %s\n" % (ver[0],ver[1],ver[2],ver[3]))
|
msg.write("Python : %s.%s.%s %s\n" % (ver[0],ver[1],ver[2],ver[3]))
|
||||||
msg.write("GTK : %s.%s.%s\n" % gtk.gtk_version)
|
msg.write("GTK : %s.%s.%s\n" % gtk.gtk_version)
|
||||||
|
msg.write('PyGTK : %d.%d.%d\n' % gtk.pygtk_version)
|
||||||
for n in _release_files:
|
for n in _release_files:
|
||||||
if os.path.isfile(n):
|
if os.path.isfile(n):
|
||||||
try:
|
try:
|
||||||
|
@ -811,9 +811,9 @@ class Gramps:
|
|||||||
|
|
||||||
def tool_callback(self,val):
|
def tool_callback(self,val):
|
||||||
if val:
|
if val:
|
||||||
import_tool_callback()
|
self.import_tool_callback()
|
||||||
|
|
||||||
def import_tool_callback(self,val):
|
def import_tool_callback(self):
|
||||||
Utils.modified()
|
Utils.modified()
|
||||||
self.clear_person_tabs()
|
self.clear_person_tabs()
|
||||||
self.full_update()
|
self.full_update()
|
||||||
|
@ -75,6 +75,7 @@ class ReorderIds:
|
|||||||
# hasn't already been chosen. If it has, put this
|
# hasn't already been chosen. If it has, put this
|
||||||
# in the duplicate id list
|
# in the duplicate id list
|
||||||
|
|
||||||
|
try:
|
||||||
index = match.groups()[0]
|
index = match.groups()[0]
|
||||||
newid = prefix % int(index)
|
newid = prefix % int(index)
|
||||||
if newid == id:
|
if newid == id:
|
||||||
@ -89,6 +90,8 @@ class ReorderIds:
|
|||||||
del data_map[id]
|
del data_map[id]
|
||||||
if update:
|
if update:
|
||||||
update(newid,id)
|
update(newid,id)
|
||||||
|
except:
|
||||||
|
dups.append(id)
|
||||||
else:
|
else:
|
||||||
dups.append(id)
|
dups.append(id)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user