opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-29 17:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into py3-compat-drop

Browse Source
This commit is contained in:
Dannon Baker
2020-07-20 11:40:25 -04:00
parent febc615e11 a8817489e9
commit 3de5d7ac5d
299 changed files with 2813 additions and 1374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/util/commit_util.py
+8 -7
View File
@@ -41,13 +41,14 @@ def check_archive(repository, archive):
undesirable_files.append(member)
continue
head = tail = member.name
try:
while tail:
head, tail = os.path.split(head)
if tail in UNDESIRABLE_DIRS:
undesirable_dirs.append(member)
assert False
except AssertionError:
found_undesirable_dir = False
while tail:
head, tail = os.path.split(head)
if tail in UNDESIRABLE_DIRS:
undesirable_dirs.append(member)
found_undesirable_dir = True
break
if found_undesirable_dir:
continue
if repository.type == rt_util.REPOSITORY_SUITE_DEFINITION and member.name != rt_util.REPOSITORY_DEPENDENCY_DEFINITION_FILENAME:
errors.append('Repositories of type <b>Repository suite definition</b> can contain only a single file named <b>repository_dependencies.xml</b>.')