2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4a89414b4d41/ Changeset: 4a89414b4d41 User: dannon Date: 2014-06-09 17:22:53 Summary: Add admin_users_list to the toolshed's config. Affected #: 1 file diff -r 9b18fb85eed5129f5fd50a44c97ec6fd3a71dd9d -r 4a89414b4d41720a3a948d2770686165f288d8c2 lib/galaxy/webapps/tool_shed/config.py --- a/lib/galaxy/webapps/tool_shed/config.py +++ b/lib/galaxy/webapps/tool_shed/config.py @@ -83,6 +83,7 @@ self.template_path = resolve_path( kwargs.get( "template_path", "templates" ), self.root ) self.template_cache = resolve_path( kwargs.get( "template_cache_path", "database/compiled_templates/community" ), self.root ) self.admin_users = kwargs.get( "admin_users", "" ) + self.admin_users_list = [u.strip() for u in self.admin_users.split(',') if u] self.sendmail_path = kwargs.get('sendmail_path',"/usr/sbin/sendmail") self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-announce-join@bx.psu.edu") self.error_email_to = kwargs.get( 'error_email_to', None ) https://bitbucket.org/galaxy/galaxy-central/commits/07803dcc426e/ Changeset: 07803dcc426e User: dannon Date: 2014-06-09 17:23:14 Summary: merge. Affected #: 1 file diff -r 4a89414b4d41720a3a948d2770686165f288d8c2 -r 07803dcc426e801a9e398d8e1ddf3b390b7a3944 lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py @@ -1098,7 +1098,7 @@ return tool_dependency, filtered_actions, dir return tool_dependency, None, None # Pull in perl dependencies (runtime). - env_file_builder.handle_action_shell_file_paths( env_file_builder, action_dict ) + env_file_builder.handle_action_shell_file_paths( action_dict ) # Recursively add dependent PERL5LIB and PATH to env.sh & anything else needed. env_file_builder.append_line( name="PERL5LIB", action="prepend_to", @@ -1130,8 +1130,7 @@ # in action_dict. all_env_shell_file_paths = [] env_manager = EnvManager( app ) - action_dict = env_manager.get_env_shell_file_paths_from_setup_environment_elem( app, - all_env_shell_file_paths, + action_dict = env_manager.get_env_shell_file_paths_from_setup_environment_elem( all_env_shell_file_paths, action_elem, action_dict ) perl_packages = [] @@ -1234,8 +1233,7 @@ # 'env_shell_file_paths' entry in action_dict. all_env_shell_file_paths = [] env_manager = EnvManager( app ) - action_dict = env_manager.get_env_shell_file_paths_from_setup_environment_elem( app, - all_env_shell_file_paths, + action_dict = env_manager.get_env_shell_file_paths_from_setup_environment_elem( all_env_shell_file_paths, action_elem, action_dict ) r_packages = list() @@ -1324,7 +1322,7 @@ return tool_dependency, filtered_actions, dir return tool_dependency, None, None # Pull in ruby dependencies (runtime). - env_file_builder.handle_action_shell_file_paths( env_file_builder, action_dict ) + env_file_builder.handle_action_shell_file_paths( action_dict ) env_file_builder.append_line( name="GEM_PATH", action="prepend_to", value=install_environment.install_dir ) @@ -1356,8 +1354,7 @@ # 'env_shell_file_paths' entry in action_dict. all_env_shell_file_paths = [] env_manager = EnvManager( app ) - action_dict = env_manager.get_env_shell_file_paths_from_setup_environment_elem( app, - all_env_shell_file_paths, + action_dict = env_manager.get_env_shell_file_paths_from_setup_environment_elem( all_env_shell_file_paths, action_elem, action_dict ) ruby_package_tups = [] 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.