Allow duplicate $required_packages

[puppet-modules/puppetlabs-apt.git] / manifests / ppa.pp

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 75f0a69574368316f4540567d00b92383645391b..a41c814f296e4a4f4c8f4462208ec3242e345a69 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,13 +1,21 @@
 # ppa.pp
 
-define apt::ppa(
-       
-) {
-       include apt
-       
-       exec { "/usr/bin/add-apt-repository ${name}":
-               require => Package["python-software-properties"],
-               # TODO: unless => 'check'
-       }
+define apt::ppa() {
+
+  Class['apt'] -> Apt::Ppa[$title]
+
+  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}"],
+    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}.*$'",
+    }
+  }
 }