2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/26952d141e42/
Changeset: 26952d141e42
Branch: next-stable
User: dannon
Date: 2014-05-27 23:11:01
Summary: Fix dep_value being undefined at use. Someone needs to look at the logic
here, this is purely an operational fix preventing a crash -- there's logic that still
needs to happen somewhere in the chain here.
Affected #: 1 file
diff -r 7a6ce727849489c03fbf766bc98357af52d4ffb8 -r
26952d141e42bd936eab9465c2761325204f9531 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -894,6 +894,10 @@
# If we got this far, we can actually look at the dependencies
# to see if their values will not be available until runtime.
for dep_name in self.get_dependencies():
+ # This may not be completely correct, but it's possible to go
+ # through the layers indicated below without assigning dep_value,
+ # which is even worse. TODO fix it?
+ dep_value = None
if dep_name in context:
dep_value = context[ dep_name ]
else:
@@ -1063,7 +1067,7 @@
'value': value
})
return d
-
+
def _get_dbkey_names( self, trans=None ):
if not self.tool:
# Hack for unit tests, since we have no tool
@@ -1735,7 +1739,7 @@
field_name = "%s%s" % ( self.name, suffix )
field = form_builder.SelectField( field_name, multiple, None,
self.refresh_on_change, refresh_on_change_values=self.refresh_on_change_values )
-
+
dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher )
for history_dataset_collection in history.active_dataset_collections:
https://bitbucket.org/galaxy/galaxy-central/commits/be58520000c7/
Changeset: be58520000c7
User: dannon
Date: 2014-05-27 23:11:13
Summary: merge next-stable.
Affected #: 1 file
diff -r fefcf6f47abe795b392348fbb901ffdf7b5c61ab -r
be58520000c71329d6e63830fc5776604c7b8382 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -894,6 +894,10 @@
# If we got this far, we can actually look at the dependencies
# to see if their values will not be available until runtime.
for dep_name in self.get_dependencies():
+ # This may not be completely correct, but it's possible to go
+ # through the layers indicated below without assigning dep_value,
+ # which is even worse. TODO fix it?
+ dep_value = None
if dep_name in context:
dep_value = context[ dep_name ]
else:
@@ -1063,7 +1067,7 @@
'value': value
})
return d
-
+
def _get_dbkey_names( self, trans=None ):
if not self.tool:
# Hack for unit tests, since we have no tool
@@ -1735,7 +1739,7 @@
field_name = "%s%s" % ( self.name, suffix )
field = form_builder.SelectField( field_name, multiple, None,
self.refresh_on_change, refresh_on_change_values=self.refresh_on_change_values )
-
+
dataset_collection_matcher = DatasetCollectionMatcher( dataset_matcher )
for history_dataset_collection in history.active_dataset_collections:
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.