riak_cookbook_19.diff

From 52f34f81e6c66e69eacbcd85979e6430dc903a3e Mon Sep 17 00:00:00 2001
From: Jeff Pollard <jeff.pollard@gmail.com>
Date: Wed, 12 Oct 2011 16:13:59 -0700
Subject: [PATCH] Fix 1.9 incompatabiliy with the riak cookbook

---
 cookbooks/riak/libraries/riak_template_helper.rb |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cookbooks/riak/libraries/riak_template_helper.rb b/cookbooks/riak/libraries/riak_template_helper.rb
index 15c1765..6c0d542 100644
--- a/cookbooks/riak/libraries/riak_template_helper.rb
+++ b/cookbooks/riak/libraries/riak_template_helper.rb
@@ -63,10 +63,9 @@ module RiakTemplateHelper
     riak.reject! {|k,_| RIAK_REMOVE_CONFIGS.include? k }
 
     # Rename sections
-    riak.each do |k,v|
-      next if k.nil?
-      if RIAK_TRANSLATE_CONFIGS.include? k
-        riak[RIAK_TRANSLATE_CONFIGS[k]] = riak.delete(k)
+    RIAK_TRANSLATE_CONFIGS.each do |old_key, new_key|
+      if riak.include?(old_key)
+        riak[new_key] = riak.delete(old_key)
       end
     end
 
-- 
1.7.4.1+GitX