Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/apps-not-launching-after-last-PR' into develop

Browse source
This commit is contained in:
Milan Kolar 2018-12-07 01:12:51 +01:00
commit d4b66146ee
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pype/ftrack/actions/action_Apps.py
View file

@ -9,7 +9,7 @@ from app.api import Logger
log = Logger.getLogger(__name__)
def registerApp(app, session):
name = app['name'].replace("_", ".")
name = app['name']
variant = ""
try:
variant = app['name'].split("_")[1]
@ -17,6 +17,7 @@ def registerApp(app, session):
log.warning("'{0}' - App 'name' and 'variant' is not separated by '_' (variant is not set)".format(app['name']))
return
log.warning("app name {}".format(name))
abspath = lib.which_app(app['name'])
if abspath == None:
log.error("'{0}' - App don't have config toml file".format(app['name']))

8
pype/ftrack/actions/ftrack_action_handler.py
View file

@ -132,7 +132,7 @@ class AppAction(object):
else:
apps = []
for app in project['config']['apps']:
apps.append(app['name'].split("_")[0])
apps.append(app['name'])
if self.identifier not in apps:
return False
@ -231,8 +231,8 @@ class AppAction(object):
os.environ["AVALON_SILO"] = entity['ancestors'][0]['name']
os.environ["AVALON_ASSET"] = entity['parent']['name']
os.environ["AVALON_TASK"] = entity['name']
os.environ["AVALON_APP"] = self.identifier
os.environ["AVALON_APP_NAME"] = self.identifier + "_" + self.variant
os.environ["AVALON_APP"] = self.identifier.split("_")[0]
os.environ["AVALON_APP_NAME"] = self.identifier
os.environ["FTRACK_TASKID"] = id
@ -273,7 +273,7 @@ class AppAction(object):
parents.append(session.get(item['type'], item['id']))
# collect all the 'environment' attributes from parents
tools_attr = [os.environ["AVALON_APP_NAME"]]
tools_attr = [os.environ["AVALON_APP"], os.environ["AVALON_APP_NAME"]]
for parent in reversed(parents):
# check if the attribute is empty, if not use it
if parent['custom_attributes']['tools_env']: