1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/2f2a223f1dde/ changeset: r5504:2f2a223f1dde user: natefoo date: 2011-05-06 17:49:02 summary: Standardize naming of reserved/predefined values in the param_dict. Old values are maintaned as well. affected #: 2 files (156 bytes) --- a/lib/galaxy/jobs/__init__.py Fri May 06 10:28:54 2011 -0400 +++ b/lib/galaxy/jobs/__init__.py Fri May 06 11:49:02 2011 -0400 @@ -352,8 +352,8 @@ else: userId = 'Anonymous' userEmail = 'Anonymous' - incoming['userId'] = userId - incoming['userEmail'] = userEmail + incoming['__user_id__'] = incoming['userId'] = userId + incoming['__user_email__'] = incoming['userEmail'] = userEmail # Build params, done before hook so hook can use param_dict = self.tool.build_param_dict( incoming, inp_data, out_data, self.get_output_fnames(), self.working_directory ) # Certain tools require tasks to be completed prior to job execution --- a/lib/galaxy/tools/__init__.py Fri May 06 10:28:54 2011 -0400 +++ b/lib/galaxy/tools/__init__.py Fri May 06 11:49:02 2011 -0400 @@ -1514,11 +1514,11 @@ param_dict['__new_file_path__'] = os.path.abspath(self.app.config.new_file_path) # The following points to location (xxx.loc) files which are pointers # to locally cached data - param_dict['GALAXY_DATA_INDEX_DIR'] = self.app.config.tool_data_path + param_dict['__tool_data_path__'] = param_dict['GALAXY_DATA_INDEX_DIR'] = self.app.config.tool_data_path # For the upload tool, we need to know the root directory and the # datatypes conf path, so we can load the datatypes registry - param_dict['GALAXY_ROOT_DIR'] = os.path.abspath( self.app.config.root ) - param_dict['GALAXY_DATATYPES_CONF_FILE'] = os.path.abspath( self.app.config.datatypes_config ) + param_dict['__root_dir__'] = param_dict['GALAXY_ROOT_DIR'] = os.path.abspath( self.app.config.root ) + param_dict['__datatypes_config__'] = param_dict['GALAXY_DATATYPES_CONF_FILE'] = os.path.abspath( self.app.config.datatypes_config ) # Return the dictionary of parameters return param_dict Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.