3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ee6d553f7847/ Changeset: ee6d553f7847 Branch: stable User: natefoo Date: 2013-08-28 22:02:16 Summary: Logic on DiskObjectStore's empty() method was reversed (previously returned True when non-empty). Affected #: 1 file diff -r de04c251c6cae5760fd13c83030a6aab78ae0c4e -r ee6d553f7847ec47cca0cf205c767d1407eccbab lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -297,7 +297,7 @@ util.umask_fix_perms(path, self.config.umask, 0666) def empty(self, obj, **kwargs): - return os.path.getsize(self.get_filename(obj, **kwargs)) > 0 + return os.path.getsize(self.get_filename(obj, **kwargs)) == 0 def size(self, obj, **kwargs): if self.exists(obj, **kwargs): https://bitbucket.org/galaxy/galaxy-central/commits/f2677acb7d77/ Changeset: f2677acb7d77 User: natefoo Date: 2013-08-28 22:02:35 Summary: merge stable. Affected #: 2 files diff -r a60d756aeb5d40c62854fda8a5f5be274762cd86 -r f2677acb7d775a4d9ca26fc78a003dab060a0e8b lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -286,7 +286,7 @@ util.umask_fix_perms(path, self.config.umask, 0666) def empty(self, obj, **kwargs): - return os.path.getsize(self.get_filename(obj, **kwargs)) > 0 + return os.path.getsize(self.get_filename(obj, **kwargs)) == 0 def size(self, obj, **kwargs): if self.exists(obj, **kwargs): https://bitbucket.org/galaxy/galaxy-central/commits/4fea98291cbc/ Changeset: 4fea98291cbc User: natefoo Date: 2013-08-28 22:04:59 Summary: Remove S3 connection method from objectstore, missed when S3 was moved to its own module. Affected #: 1 file diff -r f2677acb7d775a4d9ca26fc78a003dab060a0e8b -r 4fea98291cbce9a0e8d580bfd9c4ef4a5184c680 lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -565,25 +565,3 @@ else: size = '%.2fb' % bytes return size - -def get_OS_connection(config): - """ - Get a connection object for a cloud Object Store specified in the config. - Currently, this is a ``boto`` connection object. - """ - log.debug("Getting a connection object for '{0}' object store".format(config.object_store)) - a_key = config.os_access_key - s_key = config.os_secret_key - if config.object_store == 's3': - return S3Connection(a_key, s_key) - else: - # Establish the connection now - calling_format = boto.s3.connection.OrdinaryCallingFormat() - s3_conn = boto.connect_s3(aws_access_key_id=a_key, - aws_secret_access_key=s_key, - is_secure=config.os_is_secure, - host=config.os_host, - port=int(config.os_port), - calling_format=calling_format, - path=config.os_conn_path) - return s3_conn 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.