1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/411d8fb07181/ Changeset: 411d8fb07181 User: jmchilton Date: 2014-06-09 17:51:54 Summary: More robust path handling for remotely generated metadata. Affected #: 1 file diff -r 07803dcc426e801a9e398d8e1ddf3b390b7a3944 -r 411d8fb07181e3599ddb54d4924876fa846979c1 lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -1073,8 +1073,12 @@ output_filename = self.external_output_metadata.get_output_filenames_by_dataset( dataset, self.sa_session ).filename_out def path_rewriter( path ): - if remote_working_directory and path and path.startswith( remote_working_directory ): - return path.replace( remote_working_directory, self.working_directory, 1 ) + if not remote_working_directory or not path: + return path + normalized_remote_working_directory = os.path.normpath( remote_working_directory ) + normalized_path = os.path.normpath( path ) + if normalized_path.startswith( normalized_remote_working_directory ): + return normalized_path.replace( normalized_remote_working_directory, self.working_directory, 1 ) return path dataset.metadata.from_JSON_dict( output_filename, path_rewriter=path_rewriter ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.