Merge branch 'release_16.07' into dev

This commit is contained in:
Nicola Soranzo
2016-09-23 17:59:52 +01:00
+2 -2
View File
@@ -23,7 +23,7 @@ sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pa
import galaxy.webapps.tool_shed.model.mapping
from galaxy.tools.loader_directory import load_tool_elements_from_path
from galaxy.util import pretty_print_time_interval
from galaxy.util import directory_hash_id, pretty_print_time_interval
from galaxy.webapps.tool_shed import config, model
repo_schema = Schema(
@@ -152,7 +152,7 @@ def get_repos( sa_session, path_to_repositories ):
# Parse all the tools within repo for separate index.
tools_list = []
path = os.path.join( path_to_repositories, *model.directory_hash_id( repo.id ))
path = os.path.join( path_to_repositories, *directory_hash_id( repo.id ) )
path = os.path.join( path, "repo_%d" % repo.id )
if os.path.exists(path):
tools_list.extend( load_one_dir( path ) )