Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345768 )
Change subject: Merge environment, don't clobber
......................................................................
Merge environment, don't clobber
Change-Id: Ide20e2ad2724715833fa2a7b15be08e7d3b7272c
FIXME: testing for this breaks things weirdly
---
M processcontrol/job_wrapper.py
1 file changed, 2 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/68/345768/1
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 699f522..5306c30 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -52,10 +52,9 @@
if not self.config.has("schedule"):
self.enabled = False
+ self.environment = os.environ.copy()
if self.config.has("environment"):
- self.environment = self.config.get("environment")
- else:
- self.environment = {}
+ self.environment.update(self.config.get("environment"))
def run(self):
lock.begin(job_tag=self.slug)
--
To view, visit https://gerrit.wikimedia.org/r/345768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide20e2ad2724715833fa2a7b15be08e7d3b7272c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
