ignore whether 32-bit or 64-bit when reporting Windows o.s.
Fixes #8832
This commit is contained in:
parent
ad93ef2bb2
commit
d611b8b99c
@ -27,6 +27,7 @@
|
|||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import platform
|
||||||
|
|
||||||
##import logging
|
##import logging
|
||||||
##_LOG = logging.getLogger(".GrampsAboutDialog")
|
##_LOG = logging.getLogger(".GrampsAboutDialog")
|
||||||
@ -125,12 +126,9 @@ class GrampsAboutDialog(Gtk.AboutDialog):
|
|||||||
"""
|
"""
|
||||||
Obtain version information of core dependencies
|
Obtain version information of core dependencies
|
||||||
"""
|
"""
|
||||||
|
distro = "" # print nothing if there's nothing to print
|
||||||
if hasattr(os, "uname"):
|
if hasattr(os, "uname"):
|
||||||
operatingsystem = os.uname()[0]
|
|
||||||
distro = "\n" + _("Distribution: %s") % ellipses(os.uname()[2])
|
distro = "\n" + _("Distribution: %s") % ellipses(os.uname()[2])
|
||||||
else: # probably Windows
|
|
||||||
operatingsystem = sys.platform
|
|
||||||
distro = "" # print nothing if there's nothing to print
|
|
||||||
|
|
||||||
sqlite = ''
|
sqlite = ''
|
||||||
if __debug__:
|
if __debug__:
|
||||||
@ -149,7 +147,7 @@ class GrampsAboutDialog(Gtk.AboutDialog):
|
|||||||
ellipses(str(sys.version).replace('\n','')),
|
ellipses(str(sys.version).replace('\n','')),
|
||||||
BSDDB_STR,
|
BSDDB_STR,
|
||||||
ellipses(get_env_var('LANG','')),
|
ellipses(get_env_var('LANG','')),
|
||||||
ellipses(operatingsystem)))
|
ellipses(platform.system())))
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
@ -28,8 +28,10 @@ from gi.repository import Gdk
|
|||||||
from gi.repository import Gtk
|
from gi.repository import Gtk
|
||||||
from gi.repository import GdkPixbuf
|
from gi.repository import GdkPixbuf
|
||||||
from gi.repository import GObject
|
from gi.repository import GObject
|
||||||
|
|
||||||
import cairo
|
import cairo
|
||||||
import sys, os
|
import sys, os
|
||||||
|
import platform
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import bsddb3 as bsddb # ok, in try/except
|
import bsddb3 as bsddb # ok, in try/except
|
||||||
@ -167,12 +169,9 @@ class ErrorReportAssistant(ManagedWindow, Gtk.Assistant):
|
|||||||
"""
|
"""
|
||||||
Get relevant system information.
|
Get relevant system information.
|
||||||
"""
|
"""
|
||||||
|
distribution = "" # print nothing if there's nothing to print
|
||||||
if hasattr(os, "uname"):
|
if hasattr(os, "uname"):
|
||||||
operatingsystem = os.uname()[0]
|
|
||||||
distribution = "Distribution: %s\n" % os.uname()[2]
|
distribution = "Distribution: %s\n" % os.uname()[2]
|
||||||
else: # probably Windows
|
|
||||||
operatingsystem = sys.platform
|
|
||||||
distribution = "" # print nothing if there's nothing to print
|
|
||||||
|
|
||||||
sqlite = ''
|
sqlite = ''
|
||||||
if __debug__:
|
if __debug__:
|
||||||
@ -194,7 +193,7 @@ class ErrorReportAssistant(ManagedWindow, Gtk.Assistant):
|
|||||||
BSDDB_STR,
|
BSDDB_STR,
|
||||||
sqlite,
|
sqlite,
|
||||||
get_env_var('LANG',''),
|
get_env_var('LANG',''),
|
||||||
operatingsystem,
|
platform.system(),
|
||||||
distribution,
|
distribution,
|
||||||
'%d.%d.%d' % (Gtk.get_major_version(),
|
'%d.%d.%d' % (Gtk.get_major_version(),
|
||||||
Gtk.get_minor_version(),
|
Gtk.get_minor_version(),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user