1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/2dd7d2162a34/
changeset: 2dd7d2162a34
user: richard_burhans
date: 2012-04-09 21:38:05
summary: fix path to proprietary_datatype_module so that we get the correct error message when an import fails
affected #: 1 file
diff -r 7274516136812ee0a84aa69f420348848d1b5b08 -r 2dd7d2162a34d2cdabe0f93a31b6f640621ce5e1 lib/galaxy/datatypes/registry.py
--- a/lib/galaxy/datatypes/registry.py
+++ b/lib/galaxy/datatypes/registry.py
@@ -141,7 +141,7 @@
if hasattr( imported_module, datatype_class_name ):
datatype_class = getattr( imported_module, datatype_class_name )
except Exception, e:
- full_path = os.path.join( full_path, proprietary_datatype_module )
+ full_path = os.path.join( proprietary_path, proprietary_datatype_module )
self.log.debug( "Exception importing proprietary code file %s: %s" % ( str( full_path ), str( e ) ) )
finally:
lock.release()
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/changeset/0cab089a6ad7/
changeset: 0cab089a6ad7
user: jgoecks
date: 2012-04-09 17:02:04
summary: Fix bug that prevented actions from being taken on left panel.
affected #: 1 file
diff -r 90ace706e150f651a540bfcd9fc369fd857115b9 -r 0cab089a6ad7305c3ec968c39a7032b640376363 templates/base_panels.mako
--- a/templates/base_panels.mako
+++ b/templates/base_panels.mako
@@ -64,7 +64,7 @@
%if self.has_left_panel:
var lp = new Panel( { panel: $("#left"), center: $("#center"), drag: $("#left > .unified-panel-footer > .drag" ), toggle: $("#left > .unified-panel-footer > .panel-collapse" ) } );
- force_left_panel = lp.force_panel;
+ force_left_panel = function( x ) { lp.force_panel( x ) };
%endif
%if self.has_right_panel:
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/changeset/ee0459fb77f2/
changeset: ee0459fb77f2
user: natefoo
date: 2012-04-06 16:21:25
summary: Fix missing import in job manager.
affected #: 1 file
diff -r 34b5ed4d756ec979eecc77c8dae2a09a1112ad2d -r ee0459fb77f2e14cf89eb162eb63f0ca1e539419 lib/galaxy/jobs/manager.py
--- a/lib/galaxy/jobs/manager.py
+++ b/lib/galaxy/jobs/manager.py
@@ -13,6 +13,7 @@
from galaxy import model
from galaxy.jobs import handler, Sleeper, NoopQueue
+from galaxy.util.json import from_json_string
log = logging.getLogger( __name__ )
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.