opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Dannon Baker
2013-09-26 09:49:50 -04:00
parent 35a44e77f7 ed9fc69f33
commit ec4ca242cf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/eggs/__init__.py
+1 -1
View File
@@ -378,7 +378,7 @@ class GalaxyConfig( object ):
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(","),
scripts/set_user_disk_usage.py
+2 -2
View File
@@ -76,7 +76,7 @@ def quotacheck( sa_session, users, engine ):
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 @@ def quotacheck( sa_session, users, engine ):
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()