1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/d404a6f6d01e/
Changeset: d404a6f6d01e
User: guerler
Date: 2014-10-16 23:47:55+00:00
Summary: Api: Ftp files return empty list instead of raising error if directory is missing
Affected #: 1 file
diff -r eb28a9bcb4d9ca99613b667300095ce8a52f7ae3 -r d404a6f6d01e6af5cbd35a427c474cee47fe963a lib/galaxy/webapps/galaxy/api/ftp_files.py
--- a/lib/galaxy/webapps/galaxy/api/ftp_files.py
+++ b/lib/galaxy/webapps/galaxy/api/ftp_files.py
@@ -112,8 +112,7 @@
response.append( dict( path = path,
size = statinfo.st_size,
ctime = time.strftime( "%m/%d/%Y %I:%M:%S %p", time.localtime( statinfo.st_ctime ) ) ) )
- else:
- raise exceptions.ConfigDoesNotAllowException( 'The given directory does not exist.' )
+
# sort by path
response = sorted(response, key=itemgetter("path"))
return response
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/eb28a9bcb4d9/
Changeset: eb28a9bcb4d9
User: dannon
Date: 2014-10-16 23:37:30+00:00
Summary: Tool's command might be separated by a newline, so we should use the general form split here, not specifically on spaces. Pointed out by @kellrott.
Affected #: 1 file
diff -r d09b44c5f22839e1b87f5673bdd1615b67b3ca51 -r eb28a9bcb4d9ca99613b667300095ce8a52f7ae3 lib/galaxy/tools/__init__.py
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -699,7 +699,7 @@
def load_tooldir_tag_set(self, sub_elem, elems, tool_path, integrated_elems, load_panel_dict):
directory = os.path.join( tool_path, sub_elem.attrib.get("dir") )
- recursive = string_as_bool( sub_elem.attrib.get("recursive", True) )
+ recursive = string_as_bool( sub_elem.attrib.get("recursive", True) )
self.__watch_directory( directory, elems, integrated_elems, load_panel_dict, recursive )
def __watch_directory( self, directory, elems, integrated_elems, load_panel_dict, recursive):
@@ -825,7 +825,7 @@
tool_tup = ( os.path.abspath( tool.config_file ), os.path.split( tool.config_file )[-1] )
tarball_files.append( tool_tup )
# TODO: This feels hacky.
- tool_command = tool.command.strip().split( ' ' )[0]
+ tool_command = tool.command.strip().split()[0]
tool_path = os.path.dirname( os.path.abspath( tool.config_file ) )
# Add the tool XML to the tuple that will be used to populate the tarball.
if os.path.exists( os.path.join( tool_path, tool_command ) ):
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/70c404e681a0/
Changeset: 70c404e681a0
User: dannon
Date: 2014-10-16 17:54:46+00:00
Summary: S3ObjectStore will create the bucket for you when possible if it does not exist.
Affected #: 1 file
diff -r b1d9b4f49abb5f27bf54e01901fc37fe2fe20681 -r 70c404e681a0f4c347eaca75d65f23a11edcb823 lib/galaxy/objectstore/s3.py
--- a/lib/galaxy/objectstore/s3.py
+++ b/lib/galaxy/objectstore/s3.py
@@ -167,8 +167,12 @@
log.debug("Using cloud object store with bucket '%s'" % bucket.name)
return bucket
except S3ResponseError:
- log.debug("Could not get bucket '%s', attempt %s/5" % (bucket_name, i + 1))
- time.sleep(2)
+ try:
+ log.debug("Bucket not found, creating s3 bucket with handle '%s'" % bucket_name)
+ self.conn.create_bucket(bucket_name)
+ except S3ResponseError:
+ log.exception("Could not get bucket '%s', attempt %s/5" % (bucket_name, i + 1))
+ time.sleep(2)
# All the attempts have been exhausted and connection was not established,
# raise error
raise S3ResponseError
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/20882e294f92/
Changeset: 20882e294f92
User: guerler
Date: 2014-10-16 17:42:17+00:00
Summary: SelectToolParameter: Fix type check before split operation.
Affected #: 1 file
diff -r 0d44e35432abe4071aa073d1eb4cad074b7fc067 -r 20882e294f925cb4c895e194d508bc15306e4403 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -818,7 +818,7 @@
if value == '':
value = None
else:
- if not isinstance( value, list ):
+ if isinstance( value, basestring ):
# Split on all whitespace. This not only provides flexibility
# in interpreting values but also is needed because many browsers
# use \r\n to separate lines.
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/78c9a97be4b6/
Changeset: 78c9a97be4b6
Branch: stable
User: natefoo
Date: 2014-10-16 17:00:13+00:00
Summary: Update tag latest_2014.10.06 for changeset e1404e285ccb
Affected #: 1 file
diff -r e1404e285ccb9e52bd09c5827934cd0da1974acc -r 78c9a97be4b6bfe55136b055477fd1b9f22fd848 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -20,4 +20,4 @@
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-1744b7d8e9ab619d78c0516f9ccb093b0a814163 latest_2014.10.06
+e1404e285ccb9e52bd09c5827934cd0da1974acc latest_2014.10.06
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.