From: Vincent <Vincent--@users.noreply.github.com>
Date: Mon, 24 Aug 2015 16:53:02 +0000 (+0100)
Subject: Corrected regression with preference files name
X-Git-Tag: 2.2.0~2^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a531b2b4245f2df86ddf8a11e53568f43b6e1ffb;hp=418820adf36d5897bf7069dfa62312c3c839604f;p=puppet-modules%2Fpuppetlabs-apt.git

Corrected regression with preference files name

Signed-off-by: Vincent Deygas <Vincent.Deygas@rewardgateway.com>
---

diff --git a/manifests/params.pp b/manifests/params.pp
index ea18460..861a6af 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -61,7 +61,7 @@ class apt::params {
     },
     'pref'   => {
       'path' => $preferences_d,
-      'ext'  => '',
+      'ext'  => '.pref',
     },
     'list'   => {
       'path' => $sources_list_d,
diff --git a/manifests/setting.pp b/manifests/setting.pp
index d723eb2..b0fb62b 100644
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -37,7 +37,7 @@ define apt::setting (
     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
index 07d94ef..a326bdb 100644
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -22,7 +22,7 @@ describe 'apt::setting' do
     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