Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Don't override already set env variables #67

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Chore: Don't override already set env variables #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20183ed
don't override already set env variables
iLLiCiTiT Nov 25, 2024
62060d1
Merge branch 'develop' into enhancement/do-not-override-already-set-envs
iLLiCiTiT Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions client/ayon_deadline/plugins/publish/global/collect_deadline_job_env_vars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ class CollectDeadlineJobEnvVars(pyblish.api.ContextPlugin):
]

def process(self, context):
env = {}
env = context.data.setdefault(JOB_ENV_DATA_KEY, {})
for key in self.ENV_KEYS:
# Skip already set keys
if key in env:
BigRoy marked this conversation as resolved.
Show resolved Hide resolved
continue
value = os.getenv(key)
if value:
self.log.debug(f"Setting job env: {key}: {value}")
env[key] = value

# Transfer some environment variables from current context
context.data.setdefault(JOB_ENV_DATA_KEY, {}).update(env)


class CollectAYONServerToFarmJob(CollectDeadlineJobEnvVars):
label = "Add AYON Server URL to farm job"
Expand Down