diff options
| author | mr <mr@mrautenberg.de> | 2011-09-23 12:27:16 +0200 |
|---|---|---|
| committer | mr <mr@mrautenberg.de> | 2011-09-23 12:27:16 +0200 |
| commit | be69826665ef75f00a0d96c73bb2f999b979052d (patch) | |
| tree | cb7735dcfb2926e2e2697b06ab161dae0227b1d2 /lib/task.rb | |
| parent | e1b67ddbefe6e4f456346943ffb604d2b5ad44e3 (diff) | |
| parent | 309a0bf24667de1ad0654118b3f7d4eeb66d2a0a (diff) | |
Merge branch 'release/v3.0.0'v3.0.0
Diffstat (limited to 'lib/task.rb')
| -rw-r--r-- | lib/task.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/task.rb b/lib/task.rb index dbcbe59..e6fa5e1 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -182,7 +182,7 @@ module OpenTox end def load_metadata - if (CONFIG[:yaml_hosts].include?(URI.parse(@uri).host)) + if (CONFIG[:json_hosts].include?(URI.parse(@uri).host)) result = RestClientWrapper.get(@uri, {:accept => 'application/x-yaml'}, nil, false) @metadata = YAML.load result.to_s @http_code = result.code @@ -209,7 +209,7 @@ module OpenTox def reload( accept_header=nil ) unless accept_header - if (CONFIG[:yaml_hosts].include?(URI.parse(uri).host)) + if (CONFIG[:json_hosts].include?(URI.parse(uri).host)) accept_header = "application/x-yaml" else accept_header = 'application/rdf+xml' |