opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #613 from nicobn/master

Browse source 
Fixed "unless" test condition for ppa repository
This commit is contained in:
TP Honey 2016-07-07 14:36:11 +01:00 committed by GitHub
commit 37c8d08d4e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/ppa.pp
View file

@ -48,7 +48,7 @@ define apt::ppa(
exec { "add-apt-repository-${name}":
environment => $_proxy_env,
command => "/usr/bin/add-apt-repository ${options} ${name}",
unless => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
unless => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename}",
user => 'root',
logoutput => 'on_failure',
notify => Class['apt::update'],

18
spec/defines/ppa_spec.rb
View file

@ -21,7 +21,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow+type').that_notifies('Class[Apt::Update]').with({
:environment => [],
:command => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type',
:unless => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow_type-natty.list',
:unless => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-natty.list',
:user => 'root',
:logoutput => 'on_failure',
})
@ -44,7 +44,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
:environment => [],
:command => '/usr/bin/add-apt-repository -y ppa:user/foo',
:unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-ubuntu-foo-wily.list',
:unless => '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list',
:user => 'root',
:logoutput => 'on_failure',
})
@ -83,7 +83,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with({
'environment' => [],
'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow',
'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
'user' => 'root',
'logoutput' => 'on_failure',
})
@ -123,7 +123,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:user/bar').that_notifies('Class[Apt::Update]').with({
'environment' => [],
'command' => '/usr/bin/add-apt-repository -y ppa:user/bar',
'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/user-bar-natty.list',
'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/user-bar-natty.list',
'user' => 'root',
'logoutput' => 'on_failure',
})
@ -160,7 +160,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with({
'environment' => [],
'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow',
'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
'user' => 'root',
'logoutput' => 'on_failure',
})
@ -201,7 +201,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
:environment => [],
:command => '/usr/bin/add-apt-repository ppa:user/foo',
:unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
:unless => '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
:user => 'root',
:logoutput => 'on_failure',
})
@ -235,7 +235,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
:environment => ['http_proxy=http://localhost:8080'],
:command => '/usr/bin/add-apt-repository ppa:user/foo',
:unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
:unless => '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
:user => 'root',
:logoutput => 'on_failure',
})
@ -269,7 +269,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
:environment => ['http_proxy=http://localhost:8180'],
:command => '/usr/bin/add-apt-repository ppa:user/foo',
:unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
:unless => '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
:user => 'root',
:logoutput => 'on_failure',
})
@ -303,7 +303,7 @@ describe 'apt::ppa' do
it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
:environment => ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180'],
:command => '/usr/bin/add-apt-repository ppa:user/foo',
:unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
:unless => '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list',
:user => 'root',
:logoutput => 'on_failure',
})