Merge pull request #3 from blankenberg/release_15.01

Fix for installing .loc files from the toolshed to respect shed_tool_dat...
galaxyproject · Feb 24, 2015 · 12fb5f4 · 12fb5f4
2 parents 664ed02 + ce3fc2a
commit 12fb5f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config/galaxy.ini.sample b/config/galaxy.ini.sample
@@ -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
 

diff --git a/lib/tool_shed/tools/data_table_manager.py b/lib/tool_shed/tools/data_table_manager.py
@@ -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: