← Back to branch summary

~brendan-donegan/checkbox/bug1196531

« back to all changes in this revision

Viewing changes to plainbox/plainbox/impl/job.py

  • Committer: Tarmac
  • Author(s): Brendan Donegan
  • Date: 2013-06-27 12:49:06 UTC
  • mfrom: (2172.2.1 plainbox_checkbox_data)
  • Revision ID: tarmac-20130627124906-6c7oze4kjcct31w1
"[r=zkrynicki][bug=][author=brendan-donegan] automatic merge by tarmac"

Show diffs side-by-side

added added

removed removed

Lines of Context:
plainbox/plainbox/impl/job.py
184
184
                    "Required record key {!r} was not found".format(key))
185
185
        return cls(record.data, record.origin)
186
186
 
187
 
    def modify_execution_environment(self, env, session_dir, config=None):
 
187
    def modify_execution_environment(self, env, session_dir,
 
188
                                     checkbox_data_dir, config=None):
188
189
        """
189
190
        Alter execution environment as required to execute this job.
190
191
 
224
225
        # Add CHECKBOX_SHARE that is needed by one script
225
226
        env['CHECKBOX_SHARE'] = self._checkbox.CHECKBOX_SHARE
226
227
        # Add CHECKBOX_DATA (temporary checkbox data)
227
 
        env['CHECKBOX_DATA'] = session_dir
 
228
        env['CHECKBOX_DATA'] = checkbox_data_dir
228
229
        # Inject additional variables that are requested in the config
229
230
        if config is not None and config.environment is not Unset:
230
231
            for env_var in config.environment: