1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/92519a9bfa32/ Changeset: 92519a9bfa32 User: dannon Date: 2014-05-05 15:28:41 Summary: Adjust require order in cloudlaunch controller. Affected #: 1 file
diff -r a45f6e57f3d5a4075430a6d460a6caded611b867 -r 92519a9bfa32a42ce47a63fdb72c8e2d717ec52e lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py --- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py +++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py @@ -15,9 +15,9 @@ from galaxy.web.base.controller import BaseUIController from galaxy.util.json import to_json_string
+eggs.require('pyyaml') eggs.require('boto') eggs.require('bioblend') -eggs.require('pyyaml')
from boto.exception import EC2ResponseError
@@ -73,7 +73,7 @@ result = cml.launch(cluster_name, ami, instance_type, password, cfg.kernel_id, cfg.ramdisk_id, cfg.key_name, cfg.security_groups, cfg.placement) - #result is a dict with sg_names, kp_name, kp_material, rs, and instance_id + # result is a dict with sg_names, kp_name, kp_material, rs, and instance_id if not result['rs']: trans.response.status = 400 return "Instance failure, but no specific error was detected. Please check your AWS Console." @@ -86,7 +86,7 @@ pass time.sleep(1) if result['kp_material']: - #We have created a keypair. Save to tempfile for one time retrieval. + # We have created a keypair. Save to tempfile for one time retrieval. (fd, fname) = tempfile.mkstemp(prefix=PKEY_PREFIX, dir=trans.app.config.new_file_path) f = os.fdopen(fd, 'wt') f.write(result['kp_material'])
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.