Skip to content

Commit 2a84fe8

Browse files
authored
Merge pull request #134 from DavidS/const_get
(PDK-1209) Fix the other call-sites of const_defined? and const_get
2 parents 1b6b654 + 5cb89ed commit 2a84fe8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/puppet/resource_api.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -543,16 +543,16 @@ def load_provider(type_name)
543543
def load_default_provider(class_name, type_name_sym)
544544
# loads the "puppet/provider/#{type_name}/#{type_name}" file through puppet
545545
Puppet::Type.type(type_name_sym).provider(type_name_sym)
546-
Puppet::Provider.const_get(class_name).const_get(class_name)
546+
Puppet::Provider.const_get(class_name, false).const_get(class_name, false)
547547
end
548548
module_function :load_default_provider # rubocop:disable Style/AccessModifierDeclarations
549549

550550
def load_device_provider(class_name, type_name_sym, device_class_name, device_name_sym)
551551
# loads the "puppet/provider/#{type_name}/#{device_name}" file through puppet
552552
Puppet::Type.type(type_name_sym).provider(device_name_sym)
553-
provider_module = Puppet::Provider.const_get(class_name)
554-
if provider_module.const_defined?(device_class_name)
555-
provider_module.const_get(device_class_name)
553+
provider_module = Puppet::Provider.const_get(class_name, false)
554+
if provider_module.const_defined?(device_class_name, false)
555+
provider_module.const_get(device_class_name, false)
556556
else
557557
load_default_provider(class_name, type_name_sym)
558558
end

spec/puppet/resource_api_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
end
5959

6060
describe Puppet::Provider do
61-
it('has a module prepared for the provider') { expect(described_class.const_get('Minimal').name).to eq 'Puppet::Provider::Minimal' }
61+
it('has a module prepared for the provider') { expect(described_class.const_get('Minimal', false).name).to eq 'Puppet::Provider::Minimal' }
6262
end
6363
end
6464

0 commit comments

Comments
 (0)