1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/0c8763c8d529/
changeset: 0c8763c8d529
user: dan
date: 2013-02-15 19:19:30
summary: Minor formating fix for 22f7938bfa33.
affected #: 1 file
diff -r 22f7938bfa3331e1f4e03b67b85b1f9602fd1e85 -r 0c8763c8d52918ee15f83288d6d7cef153267239 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
--- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -705,7 +705,7 @@
new_install=True )
if 'data_manager' in metadata_dict:
new_data_managers = shed_util.install_data_managers( trans.app, trans.app.config.shed_data_manager_config_file, metadata_dict, shed_config_dict, relative_install_dir,
- tool_shed_repository, repository_tools_tups )
+ tool_shed_repository, repository_tools_tups )
if 'datatypes' in metadata_dict:
tool_shed_repository.status = trans.model.ToolShedRepository.installation_status.LOADING_PROPRIETARY_DATATYPES
if not tool_shed_repository.includes_datatypes:
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/359f6fbcde82/
changeset: 359f6fbcde82
user: natefoo
date: 2013-02-15 17:21:11
summary: Fix exception handling in migration script 111.
affected #: 1 file
diff -r 865c74ff03755f21eaaf4a557b1c2aeb1518e593 -r 359f6fbcde82bbf8aa1d4b932a54882f86121d71 lib/galaxy/model/migrate/versions/0111_add_job_destinations.py
--- a/lib/galaxy/model/migrate/versions/0111_add_job_destinations.py
+++ b/lib/galaxy/model/migrate/versions/0111_add_job_destinations.py
@@ -26,14 +26,14 @@
try:
c.create( Job_table )
assert c is Job_table.c.destination_id
- except:
+ except Exception, e:
log.error( "Adding column 'destination_id' to job table failed: %s" % str( e ) )
c = Column( "destination_params", JSONType, nullable=True )
try:
c.create( Job_table )
assert c is Job_table.c.destination_params
- except:
+ except Exception, e:
log.error( "Adding column 'destination_params' to job table failed: %s" % str( e ) )
def downgrade():
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/8cd0793b0fc6/
changeset: 8cd0793b0fc6
branch: stable
user: natefoo
date: 2013-02-15 16:53:20
summary: Handle the Torque 'E' job state in the CLI runner.
affected #: 1 file
diff -r 1f1072317efd5cf82cb791d75ba968c4bacffaf4 -r 8cd0793b0fc65b57f8fd93cfffc19ba105d190cf lib/galaxy/jobs/runners/cli_job/torque.py
--- a/lib/galaxy/jobs/runners/cli_job/torque.py
+++ b/lib/galaxy/jobs/runners/cli_job/torque.py
@@ -128,5 +128,6 @@
return job_states.OK
def __get_job_state(self, state):
- return { 'R' : job_states.RUNNING,
+ return { 'E' : job_states.RUNNING,
+ 'R' : job_states.RUNNING,
'Q' : job_states.QUEUED }.get(state, state)
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.