Merge pull request #562 from RewardGateway/preference_file_name

Corrected regression with preference files name
This commit is contained in:
Morgan Haskel 2015-09-02 13:26:28 -07:00
commit ff37b84980
3 changed files with 3 additions and 3 deletions

View file

@ -61,7 +61,7 @@ class apt::params {
},
'pref' => {
'path' => $preferences_d,
'ext' => '',
'ext' => '.pref',
},
'list' => {
'path' => $sources_list_d,

View file

@ -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

View file

@ -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