Browse Source

Merge pull request #196 from domcleal/pup-4709-workaround-master

Remove brackets from ini_setting titles to workaround PUP-4709
Bryan Jen 8 years ago
parent
commit
b79dd27ac5

+ 1 - 1
lib/puppet/parser/functions/create_ini_settings.rb

@@ -69,7 +69,7 @@ EOS
       end
 
       settings[section].each do |setting, value|
-        res["#{path} [#{section}] #{setting}"] = {
+        res["#{path} #{section} #{setting}"] = {
           'ensure'  => 'present',
           'section' => section,
           'setting' => setting,

+ 3 - 3
spec/classes/create_ini_settings_test_spec.rb

@@ -2,21 +2,21 @@ require 'spec_helper'
 # end-to-end test of the create_init_settings function
 describe 'create_ini_settings_test' do
   it { should have_ini_setting_resource_count(3) }
-  it { should contain_ini_setting('/tmp/foo.ini [section1] setting1').with(
+  it { should contain_ini_setting('/tmp/foo.ini section1 setting1').with(
     :ensure  => 'present',
     :section => 'section1',
     :setting => 'setting1',
     :value   => 'val1',
     :path    => '/tmp/foo.ini'
   )}
-  it { should contain_ini_setting('/tmp/foo.ini [section2] setting2').with(
+  it { should contain_ini_setting('/tmp/foo.ini section2 setting2').with(
     :ensure  => 'present',
     :section => 'section2',
     :setting => 'setting2',
     :value   => 'val2',
     :path    => '/tmp/foo.ini'
   )}
-  it { should contain_ini_setting('/tmp/foo.ini [section2] setting3').with(
+  it { should contain_ini_setting('/tmp/foo.ini section2 setting3').with(
     :ensure  => 'absent',
     :section => 'section2',
     :setting => 'setting3',