diff options
| author | sdelano <stephen@opscode.com> | 2010-08-18 00:42:39 -0700 |
|---|---|---|
| committer | sdelano <stephen@opscode.com> | 2010-08-26 13:18:21 -0700 |
| commit | 9db9fb6a78be33204742d21e49469945829e3963 (patch) | |
| tree | 7b9a0191e0b19bee9a0f8f82c9701c3cae5d9bab | |
| parent | 187678899f87a6bb86f53a5b46b77eb4be1b6bd6 (diff) | |
| download | chef-9db9fb6a78be33204742d21e49469945829e3963.tar.gz | |
fix the cookbook_version couch views so they work
| -rw-r--r-- | chef/lib/chef/cookbook_version.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chef/lib/chef/cookbook_version.rb b/chef/lib/chef/cookbook_version.rb index 8b29adbe8a..aefd8b0698 100644 --- a/chef/lib/chef/cookbook_version.rb +++ b/chef/lib/chef/cookbook_version.rb @@ -49,7 +49,7 @@ class Chef COOKBOOK_SEGMENTS = [ :resources, :providers, :recipes, :definitions, :libraries, :attributes, :files, :templates, :root_files ] DESIGN_DOCUMENT = { - "version" => 5, + "version" => 6, "language" => "javascript", "views" => { "all" => { @@ -99,8 +99,8 @@ class Chef continue; } - var valueParts = value[1].split('.').map(function(v) { return parseInt(v); }); - var resultParts = result[1].split('.').map(function(v) { return parseInt(v); }); + var valueParts = value.split('.').map(function(v) { return parseInt(v); }); + var resultParts = result.split('.').map(function(v) { return parseInt(v); }); if (valueParts[0] != resultParts[0]) { if (valueParts[0] > resultParts[0]) { @@ -139,29 +139,33 @@ class Chef if (idx == 0) { result = value; + return_key = keys[idx][1] continue; } - var valueParts = value[1].split('.').map(function(v) { return parseInt(v); }); - var resultParts = result[1].split('.').map(function(v) { return parseInt(v); }); + var valueParts = value.split('.').map(function(v) { return parseInt(v); }); + var resultParts = result.split('.').map(function(v) { return parseInt(v); }); if (valueParts[0] != resultParts[0]) { if (valueParts[0] > resultParts[0]) { result = value; + return_key = keys[idx][1] } } else if (valueParts[1] != resultParts[1]) { if (valueParts[1] > resultParts[1]) { result = value; + return_key = keys[idx][1] } } else if (valueParts[2] != resultParts[2]) { if (valueParts[2] > resultParts[2]) { result = value; + return_key = keys[idx][1] } } } - return keys[idx][1]; + return return_key; } @ }, |