[DRE-commits] [test-kitchen] 03/04: Add patch to load hash_recursive_merge from kitchen/

[Hleb Valoshka]

This is an automated email from the git hooks/post-receive script.

tsfgnu-guest pushed a commit to branch master
in repository test-kitchen.

commit 0a3b1b016335597e2b4bed0f14fba72ae2353eb0
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon Aug 29 18:27:24 2016 +0300

    Add patch to load hash_recursive_merge from kitchen/
---
 ...14-Load-hash_recursive_merge-from-kitchen.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/0014-Load-hash_recursive_merge-from-kitchen.patch b/debian/patches/0014-Load-hash_recursive_merge-from-kitchen.patch
new file mode 100644
index 0000000..ce16258
--- /dev/null
+++ b/debian/patches/0014-Load-hash_recursive_merge-from-kitchen.patch
@@ -0,0 +1,35 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 29 Aug 2016 18:24:08 +0300
+Subject: Load hash_recursive_merge from kitchen/
+
+---
+ lib/kitchen/data_munger.rb | 2 +-
+ lib/kitchen/loader/yaml.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/kitchen/data_munger.rb b/lib/kitchen/data_munger.rb
+index 122247e..f60513e 100644
+--- a/lib/kitchen/data_munger.rb
++++ b/lib/kitchen/data_munger.rb
+@@ -16,7 +16,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-require "vendor/hash_recursive_merge"
++require "kitchen/hash_recursive_merge"
+ 
+ module Kitchen
+ 
+diff --git a/lib/kitchen/loader/yaml.rb b/lib/kitchen/loader/yaml.rb
+index fb7e901..60e5352 100644
+--- a/lib/kitchen/loader/yaml.rb
++++ b/lib/kitchen/loader/yaml.rb
+@@ -17,7 +17,7 @@
+ # limitations under the License.
+ 
+ require "erb"
+-require "vendor/hash_recursive_merge"
++require "kitchen/hash_recursive_merge"
+ 
+ if RUBY_VERSION <= "1.9.3"
+   # ensure that Psych and not Syck is used for Ruby 1.9.2
diff --git a/debian/patches/series b/debian/patches/series
index 5076fa7..6a3c60f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-Disable-networked-tests.patch
 0012-Do-not-run-gem-install-during-kitchen-init.patch
 0013-Ignore-cucumber-test-which-fail-under-sbuild.patch
+0014-Load-hash_recursive_merge-from-kitchen.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/test-kitchen.git