Merge pull request #562 from RewardGateway/preference_file_name

Corrected regression with preference files name
puppetlabs · Sep 2, 2015 · ff37b84 · ff37b84
2 parents 418820a + a531b2b
commit ff37b84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -61,7 +61,7 @@
     },
     'pref'   => {
       'path' => $preferences_d,
-      'ext'  => '',
+      'ext'  => '.pref',
     },
     'list'   => {
       'path' => $sources_list_d,

diff --git a/manifests/setting.pp b/manifests/setting.pp
@@ -37,7 +37,7 @@
     validate_string($content)
   }
 
-  if $setting_type == 'list' {
+  if ($setting_type == 'list') or ($setting_type == 'pref') {
     $_priority = ''
   } else {
     $_priority = $priority

diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
@@ -22,7 +22,7 @@
     context 'with title=pref-teddybear' do
       let(:title) { 'pref-teddybear' }
       let(:params) { default_params }
-      it { is_expected.to contain_file('/etc/apt/preferences.d/50teddybear').that_notifies('Class[Apt::Update]') }
+      it { is_expected.to contain_file('/etc/apt/preferences.d/teddybear.pref').that_notifies('Class[Apt::Update]') }
     end
 
     context 'with title=list-teddybear' do