Skip to content

Commit

Permalink
Merge pull request #8182 from mvdbeek/fix_set_metadata_error_when_fil…
Browse files Browse the repository at this point in the history
…e_doesnt_exist

[19.05] Fix external_metadata_set_successfully when metadata file doesn't exist
  • Loading branch information
jmchilton committed Jun 18, 2019
2 parents 01dfcc3 + ba422d6 commit c13ad6a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/galaxy/metadata/__init__.py
Expand Up @@ -83,8 +83,12 @@ def path_rewriter(path):
dataset.metadata.from_JSON_dict(metadata_output_path, path_rewriter=path_rewriter)

def _metadata_results_from_file(self, dataset, filename_results_code):
with open(filename_results_code, "r") as f:
rval, rstring = json.load(f)
try:
with open(filename_results_code, "r") as f:
rval, rstring = json.load(f)
except (OSError, IOError):
rval = False
rstring = "Metadata results could not be read from '%s'" % filename_results_code

if not rval:
log.debug('setting metadata externally failed for %s %s: %s' % (dataset.__class__.__name__, dataset.id, rstring))
Expand Down

0 comments on commit c13ad6a

Please sign in to comment.