diff --git a/manifests/ppa.pp b/manifests/ppa.pp index f234f748e7..c4b9941d1d 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -1,7 +1,8 @@ # ppa.pp define apt::ppa( - $release = $::lsbdistcodename + $release = $::lsbdistcodename, + $options = "-y" ) { include apt::params include apt::update @@ -40,7 +41,7 @@ } exec { "add-apt-repository-${name}": environment => $proxy_env, - command => "/usr/bin/add-apt-repository ${name}", + command => "/usr/bin/add-apt-repository ${options} ${name}", creates => "${sources_list_d}/${sources_list_d_filename}", logoutput => 'on_failure', require => [ diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb index 3baa7e8657..d12c70c84d 100644 --- a/spec/defines/ppa_spec.rb +++ b/spec/defines/ppa_spec.rb @@ -20,6 +20,9 @@ let :package do "#{platform[:package]}" end + let :options do + "-y" + end ['ppa:dans_ppa', 'dans_ppa','ppa:dans-daily/ubuntu'].each do |t| describe "with title #{t}" do let :pre_condition do @@ -41,7 +44,7 @@ } it { should contain_exec("add-apt-repository-#{t}").with( - 'command' => "/usr/bin/add-apt-repository #{t}", + 'command' => "/usr/bin/add-apt-repository #{options} #{t}", 'creates' => "/etc/apt/sources.list.d/#{filename}", 'require' => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"], 'notify' => "Exec[apt_update]" @@ -73,7 +76,7 @@ "http_proxy=http://user:pass@proxy:8080", "https_proxy=http://user:pass@proxy:8080", ], - 'command' => "/usr/bin/add-apt-repository #{title}", + 'command' => "/usr/bin/add-apt-repository #{options} #{title}", 'creates' => "/etc/apt/sources.list.d/#{filename}", 'require' => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"], 'notify' => "Exec[apt_update]"