[galaxy-commits] commit/galaxy-central: 3 new changesets

3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d56c63c57bcd/ Changeset: d56c63c57bcd Branch: fix_galaxy_url_parsing User: BjoernGruening Date: 2014-11-24 16:27:10+00:00 Summary: Created new branch fix_galaxy_url_parsing Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/f420fe6e293c/ Changeset: f420fe6e293c Branch: fix_galaxy_url_parsing User: BjoernGruening Date: 2014-11-24 16:28:25+00:00 Summary: getstring() does not exist, use get() instead Affected #: 1 file diff -r d56c63c57bcdaf3abe940495c883b06edb7a72c1 -r f420fe6e293c98bd85da2b092fc34347a769041b lib/galaxy/web/base/interactive_environments.py --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -77,7 +77,7 @@ } if self.attr.viz_config.has_option("docker", "galaxy_url"): - conf_file['galaxy_url'] = self.attr.viz_config.getstring("docker", "galaxy_url") + conf_file['galaxy_url'] = self.attr.viz_config.get("docker", "galaxy_url") elif self.attr.galaxy_config.galaxy_infrastructure_url_set: conf_file['galaxy_url'] = self.attr.galaxy_config.galaxy_infrastructure_url.rstrip('/') + '/' else: https://bitbucket.org/galaxy/galaxy-central/commits/c433a83d85cc/ Changeset: c433a83d85cc User: jmchilton Date: 2014-11-24 16:57:42+00:00 Summary: Merged in BjoernGruening/galaxy-central-1/fix_galaxy_url_parsing (pull request #572) Fix bug in IE config parsing. Affected #: 1 file diff -r dd2d0b244a27460ad15df5f12eaf243702086044 -r c433a83d85cc9296b04a51b3cc1225d031ea1b16 lib/galaxy/web/base/interactive_environments.py --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -77,7 +77,7 @@ } if self.attr.viz_config.has_option("docker", "galaxy_url"): - conf_file['galaxy_url'] = self.attr.viz_config.getstring("docker", "galaxy_url") + conf_file['galaxy_url'] = self.attr.viz_config.get("docker", "galaxy_url") elif self.attr.galaxy_config.galaxy_infrastructure_url_set: conf_file['galaxy_url'] = self.attr.galaxy_config.galaxy_infrastructure_url.rstrip('/') + '/' else: 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.