Merge pull request #610 from mike1158/develop

Bugfix for MESHROOM_SUBMITTERS_PATH env variable
This commit is contained in:
Fabien Castan 2020-01-03 13:26:04 +01:00 committed by GitHub
commit ff96004421
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -260,10 +260,7 @@ meshroomFolder = os.path.dirname(os.path.dirname(__file__))
# - Nodes
loadAllNodes(folder=os.path.join(meshroomFolder, 'nodes'))
# - Submitters
subs = loadSubmitters(meshroomFolder, 'submitters')
# - additional 3rd party submitters
if "MESHROOM_SUBMITTERS_PATH" in os.environ:
subs += loadSubmitters(os.environ["MESHROOM_SUBMITTERS_PATH"], 'submitters')
subs = loadSubmitters(os.environ.get("MESHROOM_SUBMITTERS_PATH", meshroomFolder), 'submitters')
for sub in subs:
registerSubmitter(sub())