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

6408: Display GExiv2 version rather than pyexiv2 version

Browse Source 
svn: r21389
This commit is contained in:
Nick Hall 2013-02-23 23:36:23 +00:00
parent 3fabbe1ecb
commit eeaf8697f0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gramps/grampsapp.py
View File

@ -287,14 +287,13 @@ def show_settings():
osmgpsmap_str = 'not found'
try:
import pyexiv2
from gi.repository import GExiv2
try:
pyexiv2_str = '%d.%d.%d' % pyexiv2.version_info
except :# any failure to 'get' the version
pyexiv2_str = 'unknown version'
gexiv2_str = GExiv2._version
except: # any failure to 'get' the version
gexiv2_str = 'unknown version'
except ImportError:
pyexiv2_str = 'not found'
gexiv2_str = 'not found'
from .gen.config import config
usebsddb3 = config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3
@ -367,7 +366,7 @@ def show_settings():
print (' cairo : %s' % cairover_str)
print (' pycairo : %s' % pycairover_str)
print (' osmgpsmap : %s' % osmgpsmap_str)
print (' pyexiv2 : %s' % pyexiv2_str)
print (' GExiv2 : %s' % gexiv2_str)
print (' o.s. : %s' % operating_system)
if kernel:
print (' kernel : %s' % kernel)
@ -495,4 +494,4 @@ def main():
logging.warning(error[0] + error[1])
if __name__ == '__main__':
main()
main()