Allow gramps to be used from source, without GRAMPS_RESOURCES env variable
This commit is contained in:
parent
49320f0fc4
commit
c6a8af9eb6
@ -49,7 +49,6 @@ class ResourcePath(object):
|
|||||||
def __init__(self):
|
def __init__(self):
|
||||||
if self.initialized:
|
if self.initialized:
|
||||||
return
|
return
|
||||||
|
|
||||||
resource_file = os.path.join(os.path.abspath(os.path.dirname(
|
resource_file = os.path.join(os.path.abspath(os.path.dirname(
|
||||||
conv_to_unicode(__file__))), 'resource-path')
|
conv_to_unicode(__file__))), 'resource-path')
|
||||||
installed = os.path.exists(resource_file)
|
installed = os.path.exists(resource_file)
|
||||||
@ -76,8 +75,13 @@ class ResourcePath(object):
|
|||||||
LOG.error("Resource Path %s is invalid", resource_path)
|
LOG.error("Resource Path %s is invalid", resource_path)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
else:
|
else:
|
||||||
LOG.error("Unable to determine resource path")
|
# Let's try to run from source without env['GRAMPS_RESOURCES']:
|
||||||
sys.exit(1)
|
resource_path = os.path.join(os.path.abspath(os.path.dirname(
|
||||||
|
conv_to_unicode(__file__))), '..', "..", "..")
|
||||||
|
test_path = os.path.join("data", "authors.xml")
|
||||||
|
if (not os.path.exists(os.path.join(resource_path, test_path))):
|
||||||
|
LOG.error("Unable to determine resource path")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
if installed:
|
if installed:
|
||||||
self.locale_dir = os.path.join(resource_path, 'locale')
|
self.locale_dir = os.path.join(resource_path, 'locale')
|
||||||
|
Loading…
Reference in New Issue
Block a user