tweak sqlite3 info typeout to conform, only output sometimes

This commit is contained in:
Paul Franklin 2017-01-11 04:22:29 -08:00
parent 5633570250
commit 3ee28584cb
2 changed files with 11 additions and 7 deletions

View File

@ -399,10 +399,11 @@ def show_settings():
print(' version : %s' % bsddb_str) print(' version : %s' % bsddb_str)
print(' db version : %s' % bsddb_db_str) print(' db version : %s' % bsddb_db_str)
print(' location : %s' % bsddb_location_str) print(' location : %s' % bsddb_location_str)
print(' sqlite3 :') if __debug__:
print(' version : %s' % sqlite3_version_str) print(' sqlite3 :')
print(' py version : %s' % sqlite3_py_version_str) print(' version : %s' % sqlite3_version_str)
print(' location : %s' % sqlite3_location_str) print(' py version : %s' % sqlite3_py_version_str)
print(' location : %s' % sqlite3_location_str)
print('') print('')
def run(): def run():

View File

@ -132,19 +132,22 @@ class GrampsAboutDialog(Gtk.AboutDialog):
operatingsystem = sys.platform operatingsystem = sys.platform
distribution = " " distribution = " "
sqlite = ''
if __debug__:
sqlite = "sqlite: %s (%s)\n" % (sqlite3_version_str,
sqlite3_py_version_str)
return (("\n\n" + return (("\n\n" +
"GRAMPS: %s \n" + "GRAMPS: %s \n" +
"Python: %s \n" + "Python: %s \n" +
"BSDDB: %s \n" + "BSDDB: %s \n" +
"sqlite: %s (%s)\n" + sqlite +
"LANG: %s\n" + "LANG: %s\n" +
"OS: %s\n" + "OS: %s\n" +
"Distribution: %s") "Distribution: %s")
% (ellipses(str(VERSION)), % (ellipses(str(VERSION)),
ellipses(str(sys.version).replace('\n','')), ellipses(str(sys.version).replace('\n','')),
BSDDB_STR, BSDDB_STR,
sqlite3_version_str,
sqlite3_py_version_str,
ellipses(get_env_var('LANG','')), ellipses(get_env_var('LANG','')),
ellipses(operatingsystem), ellipses(operatingsystem),
ellipses(distribution))) ellipses(distribution)))