X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=db312ea13583e2f01e8c8232605d7901fafbba45;hb=63a0db4cf2335bf65f52c89d095b401a75512d48;hp=f234f748e7c6921fd16687669ee13f5cc6ee45d1;hpb=62e7faf18b180fe050c55764723a6a4898cbe331;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index f234f74..db312ea 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 @@ -12,9 +13,9 @@ define apt::ppa( fail('lsbdistcodename fact not available: release parameter required') } - $filename_without_slashes = regsubst($name, '/', '-', G) - $filename_without_dots = regsubst($filename_without_slashes, '\.', '_', G) - $filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', G) + $filename_without_slashes = regsubst($name, '/', '-', 'G') + $filename_without_dots = regsubst($filename_without_slashes, '\.', '_', 'G') + $filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', 'G') $sources_list_d_filename = "${filename_without_ppa}-${release}.list" $package = $::lsbdistrelease ? { @@ -40,7 +41,7 @@ define apt::ppa( } 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 => [