1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/80968afd0cba/
Changeset: 80968afd0cba
User: davebgx
Date: 2014-06-09 20:37:36
Summary: Use the same capitalization for eggs.require as is present in the egg's name. This resolves the install and test buildbot's failure on step 4, delete empty directories.
Affected #: 1 file
diff -r 5884328e91724e9bdf4b43f012eb63fa0c803ef6 -r 80968afd0cba850290103fb20edad4c6d3c02899 lib/tool_shed/util/basic_util.py
--- a/lib/tool_shed/util/basic_util.py
+++ b/lib/tool_shed/util/basic_util.py
@@ -8,7 +8,7 @@
from galaxy import eggs
-eggs.require( 'markupsafe' )
+eggs.require( 'MarkupSafe' )
import markupsafe
log = logging.getLogger( __name__ )
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.
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/9b18fb85eed5/
Changeset: 9b18fb85eed5
User: dannon
Date: 2014-06-09 16:53:00
Summary: Reorder imports post-PR 403.
Affected #: 1 file
diff -r 633c27341859df116d2dd039bb16e9c29bedd65a -r 9b18fb85eed5129f5fd50a44c97ec6fd3a71dd9d tools/filters/convert_characters.py
--- a/tools/filters/convert_characters.py
+++ b/tools/filters/convert_characters.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
#By, Guruprasad Ananda.
+import re
import sys
-import re
def stop_err(msg):
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.