summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-28 11:37:16 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-02-28 11:37:16 -0800
commit05c129145c246f477bb5ecf68ff08c964f91e5a6 (patch)
tree5ab054f8cfa33632df1afeabebb4ac02475438de
parentac19cbfb5fb05189e0edc400bc1acd9a7364b4d8 (diff)
downloadchef-lcg/fix-chefstyle.tar.gz
fix for master of chefstylelcg/fix-chefstyle
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/knife/environment_compare.rb2
-rw-r--r--lib/chef/knife/list.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/environment_compare.rb b/lib/chef/knife/environment_compare.rb
index 2e70783d3f..ebab1ee893 100644
--- a/lib/chef/knife/environment_compare.rb
+++ b/lib/chef/knife/environment_compare.rb
@@ -81,7 +81,7 @@ class Chef
def constraint_list(environments)
constraints = {}
- environments.each do |env, url|
+ environments.each_key do |env|
# Because you cannot modify the default environment I filter it out here.
unless env == "_default"
envdata = Chef::Environment.load(env)
diff --git a/lib/chef/knife/list.rb b/lib/chef/knife/list.rb
index 6f314eb86d..d79850c290 100644
--- a/lib/chef/knife/list.rb
+++ b/lib/chef/knife/list.rb
@@ -69,7 +69,7 @@ class Chef
# Flatten out directory results if necessary
if config[:flat]
- dir_results.each do |result, children|
+ dir_results.each_value do |children|
results += children
end
dir_results = []