[DRE-commits] [chef] 06/13: apply upstream patch to remove warnings under Ruby 2.3

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository chef.

commit bd4d10fe09858d34d4e21fe1891569edcfdae0b0
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 4 13:21:35 2016 -0300

    apply upstream patch to remove warnings under Ruby 2.3
---
 debian/changelog                                   |  2 ++
 .../0002-remove-deprecated-Thread.exclusive.patch  | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ae0bafe..2a94460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ chef (12.7.2-1) UNRELEASED; urgency=medium
   * Add debian/ruby-tests.blacklist to list test that fail and we don't know
     exactly why. At least all the other tests will run and serve as
     regression tests.
+  * 0002-remove-deprecated-Thread.exclusive.patch: apply upstream patch to
+    remove warnings under Ruby 2.3
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Thu, 03 Mar 2016 15:18:38 -0300
 
diff --git a/debian/patches/0002-remove-deprecated-Thread.exclusive.patch b/debian/patches/0002-remove-deprecated-Thread.exclusive.patch
new file mode 100644
index 0000000..e507b2b
--- /dev/null
+++ b/debian/patches/0002-remove-deprecated-Thread.exclusive.patch
@@ -0,0 +1,23 @@
+From: Nathan Williams <nathan at teamtreehouse.com>
+Date: Thu, 10 Mar 2016 18:22:05 -0800
+Subject: remove deprecated Thread.exclusive
+
+---
+ lib/chef/dsl/declare_resource.rb | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb
+index 2e7dc93..7efc985 100644
+--- a/lib/chef/dsl/declare_resource.rb
++++ b/lib/chef/dsl/declare_resource.rb
+@@ -88,9 +88,7 @@ class Chef
+       #
+       def build_resource(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
+         created_at ||= caller[0]
+-        Thread.exclusive do
+-          require "chef/resource_builder" unless defined?(Chef::ResourceBuilder)
+-        end
++        require "chef/resource_builder" unless defined?(Chef::ResourceBuilder)
+ 
+         Chef::ResourceBuilder.new(
+           type:                type,
diff --git a/debian/patches/series b/debian/patches/series
index 109f252..47a3bae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Update-gemspec-file.patch
+0002-remove-deprecated-Thread.exclusive.patch

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