Hello community, here is the log from the commit of package rubygem-chef for openSUSE:Factory checked in at 2013-07-04 10:17:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-chef (Old) and /work/SRC/openSUSE:Factory/.rubygem-chef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-chef" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-chef/rubygem-chef.changes 2013-06-28 11:55:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-chef.new/rubygem-chef.changes 2013-07-04 10:17:22.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 3 13:45:24 UTC 2013 - [email protected] + +- Backport fix for upstream bug CHEF-4123 in + CHEF-4123-chef-server-bootstrap-installation.patch + +------------------------------------------------------------------- New: ---- CHEF-4123-chef-server-bootstrap-installation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-chef.spec ++++++ --- /var/tmp/diff_new_pack.bn9dMS/_old 2013-07-04 10:17:23.000000000 +0200 +++ /var/tmp/diff_new_pack.bn9dMS/_new 2013-07-04 10:17:23.000000000 +0200 @@ -40,6 +40,7 @@ Patch0: CHEF-4015-group.patch # PATCH-FIX-UPSTREAM Patch1: CHEF-3938-dont-disable-gpg-checks-in-zypper-commands.patch +Patch2: CHEF-4123-chef-server-bootstrap-installation.patch Summary: A systems integration framework, built to bring the benefits of License: Apache-2.0 Group: Development/Languages/Ruby @@ -69,6 +70,7 @@ %gem_unpack %patch0 -p1 %patch1 -p1 +%patch2 -p1 %gem_build %build ++++++ CHEF-4123-chef-server-bootstrap-installation.patch ++++++ diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index bf5e434..eb8d7bb 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -129,6 +129,17 @@ def fix_notifier_reference(resource_collection) extend Chef::Mixin::ConvertToClassName + + if Module.method(:const_defined?).arity == 1 + def self.strict_const_defined?(const) + const_defined?(const) + end + else + def self.strict_const_defined?(const) + const_defined?(const, false) + end + end + # Track all subclasses of Resource. This is used so names can be looked up # when attempting to deserialize from JSON. (See: json_compat) def self.resource_classes diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index 5776bb5..3309ee3 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -39,7 +39,7 @@ def self.build_from_file(cookbook_name, filename, run_context) # Add log entry if we override an existing light-weight resource. class_name = convert_to_class_name(rname) - if Resource.const_defined?(class_name, false) + if Resource.strict_const_defined?(class_name) old_class = Resource.send(:remove_const, class_name) # CHEF-3432 -- Chef::Resource keeps a list of subclasses; need to # remove old ones from the list when replacing. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
