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

Fix for installing .loc files from the toolshed to respect shed_tool_dat... #3

Merged
merged 1 commit into from
Feb 24, 2015
Merged

Fix for installing .loc files from the toolshed to respect shed_tool_dat... #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions config/galaxy.ini.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ paste.app_factory = galaxy.web.buildapp:app_factory
# https://wiki.galaxyproject.org/Admin/DataIntegration
#tool_data_path = tool-data

# Directory where Tool Data Table related files will be placed
# when installed from a ToolShed. Defaults to tool_data_path
#shed_tool_data_path = tool-data

# File containing old-style genome builds
#builds_file_path = tool-data/shared/ucsc/builds.txt

Expand Down
2 changes: 1 addition & 1 deletion lib/tool_shed/tools/data_table_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def handle_sample_tool_data_table_conf_file( self, filename, persist=False ):
try:
new_table_elems, message = self.app.tool_data_tables \
.add_new_entries_from_config_file( config_filename=filename,
tool_data_path=self.app.config.tool_data_path,
tool_data_path=self.app.config.shed_tool_data_path,
shed_tool_data_table_config=self.app.config.shed_tool_data_table_config,
persist=persist )
if message:
Expand Down