2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8e782b7becb6/ Changeset: 8e782b7becb6 User: dannon Date: 2013-09-26 15:49:26 Summary: Correct distributedobjectstore parent in another place. Affected #: 1 file diff -r 47b5784396f7bbd83cb4867e824980e9d6cdf55b -r 8e782b7becb6769ad59d8bb3d75e1ed0f8f517af lib/galaxy/objectstore/__init__.py --- a/lib/galaxy/objectstore/__init__.py +++ b/lib/galaxy/objectstore/__init__.py @@ -432,7 +432,7 @@ return default -class DistributedObjectStore(ObjectStore): +class DistributedObjectStore(NestedObjectStore): """ ObjectStore that defers to a list of backends, for getting objects the first store where the object exists is used, objects are created in a https://bitbucket.org/galaxy/galaxy-central/commits/0dbc9501b7e7/ Changeset: 0dbc9501b7e7 User: dannon Date: 2013-09-26 15:49:50 Summary: Merge. Affected #: 2 files diff -r 8e782b7becb6769ad59d8bb3d75e1ed0f8f517af -r 0dbc9501b7e7943cf68df987ee528e142c892311 lib/galaxy/eggs/__init__.py --- a/lib/galaxy/eggs/__init__.py +++ b/lib/galaxy/eggs/__init__.py @@ -378,7 +378,7 @@ return True else: try: - return { "psycopg2": lambda: self.config.get( "app:main", "database_connection" ).startswith( "postgres://" ), + return { "psycopg2": lambda: self.config.get( "app:main", "database_connection" ).startswith( "postgres" ), "MySQL_python": lambda: self.config.get( "app:main", "database_connection" ).startswith( "mysql://" ), "DRMAA_python": lambda: "sge" in self.config.get( "app:main", "start_job_runners" ).split(","), "drmaa": lambda: "drmaa" in self.config.get( "app:main", "start_job_runners" ).split(","), diff -r 8e782b7becb6769ad59d8bb3d75e1ed0f8f517af -r 0dbc9501b7e7943cf68df987ee528e142c892311 scripts/set_user_disk_usage.py --- a/scripts/set_user_disk_usage.py +++ b/scripts/set_user_disk_usage.py @@ -76,7 +76,7 @@ sa_session.refresh( user ) current = user.get_disk_usage() print user.username, '<' + user.email + '>:', - if engine != 'postgres': + if engine not in ( 'postgres', 'postgresql' ): new = user.calculate_disk_usage() sa_session.refresh( user ) # usage changed while calculating, do it again @@ -94,7 +94,7 @@ print '+%s' % ( nice_size( new - current ) ) else: print '-%s' % ( nice_size( current - new ) ) - if not options.dryrun and engine != 'postgres': + if not options.dryrun and engine not in ( 'postgres', 'postgresql' ): user.set_disk_usage( new ) sa_session.add( user ) sa_session.flush() 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.