X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=a41c814f296e4a4f4c8f4462208ec3242e345a69;hb=f3735d2ba228fde8d2e119742e11bece4c2c78ac;hp=9c277e9bd4534ec35d7859a17706e5a1616f2ec4;hpb=ed2d19e2f3aa025871ec8334d48db53b800a91f2;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 9c277e9..a41c814 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -1,18 +1,21 @@ # ppa.pp -define apt::ppa( +define apt::ppa() { -) { - require apt + Class['apt'] -> Apt::Ppa[$title] - exec { "apt-update-${name}": - command => "/usr/bin/aptitude update", - refreshonly => true, - } + exec { "apt-update-${name}": + command => "/usr/bin/aptitude update", + refreshonly => true, + } - exec { "add-apt-repository-${name}": - command => "/usr/bin/add-apt-repository ${name}", - notify => Exec["apt-update-${name}"], + exec { "add-apt-repository-${name}": + command => "/usr/bin/add-apt-repository ${name}", + notify => Exec["apt-update-${name}"], + unless => $name? { + /ppa:(.*)/ => "/bin/cat /etc/apt/sources.list /etc/apt/sources.list.d/* | /bin/egrep '^[^#].*ppa.*$1.*$'", + default => "/bin/cat /etc/apt/sources.list /etc/apt/sources.list.d/* | /bin/egrep '^[^#].*${title}.*$'", } + } }