6408: Display GExiv2 version rather than pyexiv2 version
svn: r21388
This commit is contained in:
parent
7c0e4e4eb4
commit
ddf9dc9f14
@ -240,14 +240,13 @@ def show_settings():
|
|||||||
osmgpsmap_str = 'not found'
|
osmgpsmap_str = 'not found'
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import pyexiv2
|
from gi.repository import GExiv2
|
||||||
try:
|
try:
|
||||||
pyexiv2_str = '%d.%d.%d' % pyexiv2.version_info
|
gexiv2_str = GExiv2._version
|
||||||
except :# any failure to 'get' the version
|
except: # any failure to 'get' the version
|
||||||
pyexiv2_str = 'unknown version'
|
gexiv2_str = 'unknown version'
|
||||||
|
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pyexiv2_str = 'not found'
|
gexiv2_str = 'not found'
|
||||||
|
|
||||||
from .gen.config import config
|
from .gen.config import config
|
||||||
usebsddb3 = config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3
|
usebsddb3 = config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3
|
||||||
@ -320,7 +319,7 @@ def show_settings():
|
|||||||
print (' cairo : %s' % cairover_str)
|
print (' cairo : %s' % cairover_str)
|
||||||
print (' pycairo : %s' % pycairover_str)
|
print (' pycairo : %s' % pycairover_str)
|
||||||
print (' osmgpsmap : %s' % osmgpsmap_str)
|
print (' osmgpsmap : %s' % osmgpsmap_str)
|
||||||
print (' pyexiv2 : %s' % pyexiv2_str)
|
print (' GExiv2 : %s' % gexiv2_str)
|
||||||
print (' o.s. : %s' % sys.platform)
|
print (' o.s. : %s' % sys.platform)
|
||||||
if kernel:
|
if kernel:
|
||||||
print (' kernel : %s' % kernel)
|
print (' kernel : %s' % kernel)
|
||||||
|
Loading…
Reference in New Issue
Block a user