opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle exceptions caused by invalid tool configs when setting repository metadata in the tool shed.

Browse Source
This commit is contained in:
Greg Von Kuster
2012-04-16 14:12:57 -04:00
parent 44d674e039
commit 593ec2e42d
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/community/controllers/common.py
+16 -8
View File
@@ -456,10 +456,14 @@ def set_repository_metadata( trans, id, changeset_revision, content_alert_str=''
# Create a new repository_metadata table row.
repository_metadata = trans.model.RepositoryMetadata( repository.id, changeset_revision, metadata_dict )
trans.sa_session.add( repository_metadata )
trans.sa_session.flush()
# If this is the first record stored for this repository, see if we need to send any email alerts.
if len( repository.downloadable_revisions ) == 1:
handle_email_alerts( trans, repository, content_alert_str='', new_repo_alert=True, admin_only=False )
try:
trans.sa_session.flush()
# If this is the first record stored for this repository, see if we need to send any email alerts.
if len( repository.downloadable_revisions ) == 1:
handle_email_alerts( trans, repository, content_alert_str='', new_repo_alert=True, admin_only=False )
except TypeError, e:
message = "Unable to save metadata for this repository probably due to a tool config file that doesn't conform to the Cheetah template syntax."
status = 'error'
else:
repository_metadata = get_latest_repository_metadata( trans, id )
if repository_metadata:
@@ -467,9 +471,13 @@ def set_repository_metadata( trans, id, changeset_revision, content_alert_str=''
repository_metadata.changeset_revision = changeset_revision
repository_metadata.metadata = metadata_dict
trans.sa_session.add( repository_metadata )
trans.sa_session.flush()
try:
trans.sa_session.flush()
except TypeError, e:
message = "Unable to save metadata for this repository probably due to a tool config file that doesn't conform to the Cheetah template syntax."
status = 'error'
else:
# There are no tools in the repository, and we're setting metadat on the repository tip.
# There are no tools in the repository, and we're setting metadata on the repository tip.
repository_metadata = trans.model.RepositoryMetadata( repository.id, changeset_revision, metadata_dict )
trans.sa_session.add( repository_metadata )
trans.sa_session.flush()
@@ -739,12 +747,12 @@ def compare_datatypes( ancestor_datatypes, current_datatypes ):
# Currently the only way to differentiate datatypes is by name.
ancestor_datatype_dtype = ancestor_datatype[ 'dtype' ]
ancestor_datatype_extension = ancestor_datatype[ 'extension' ]
ancestor_datatype_mimetype = ancestor_datatype[ 'mimetype' ]
ancestor_datatype_mimetype = ancestor_datatype.get( 'mimetype', None )
found_in_current = False
for current_datatype in current_datatypes:
if current_datatype[ 'dtype' ] == ancestor_datatype_dtype and \
current_datatype[ 'extension' ] == ancestor_datatype_extension and \
current_datatype[ 'mimetype' ] == ancestor_datatype_mimetype:
current_datatype.get( 'mimetype', None ) == ancestor_datatype_mimetype:
found_in_current = True
break
if not found_in_current: