1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/69bb888b05cd/ Changeset: 69bb888b05cd User: jmchilton Date: 2014-09-17 19:21:34+00:00 Summary: Merge latest stable. Affected #: 3 files diff -r 818c24105d055f65047595a38ae505d5e45f7520 -r 69bb888b05cd2cbb0f553fe7f2b7c24d05e6ac97 .hgtags --- a/.hgtags +++ b/.hgtags @@ -18,4 +18,4 @@ 81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 -20f4fdf1735aeff23a6e7ab00389781fe3f3142c latest_2014.08.11 +21f2a42a06d7d2b8c408aed22c691f5e8b209311 latest_2014.08.11 diff -r 818c24105d055f65047595a38ae505d5e45f7520 -r 69bb888b05cd2cbb0f553fe7f2b7c24d05e6ac97 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -2538,6 +2538,14 @@ try: current_case = input.get_current_case( value, trans ) except ValueError, e: + if input.is_job_resource_conditional: + # Unless explicitly given job resource parameters + # (e.g. from the run tool form) don't populate the + # state. Along with other hacks prevents workflow + # saving from populating resource defaults - which + # are meant to be much more transient than the rest + # of tool state. + continue #load default initial value if not test_param_error: test_param_error = str( e ) 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.