From: Robert Navarro <rnavarro@phiivo.com>
Date: Thu, 25 Aug 2011 02:52:42 +0000 (-0400)
Subject: Refactored as per mlitteken
X-Git-Tag: 0.0.1~21^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1de4e0a2944248897ad92adbdbe88fcd46ec30fb;hp=-c;p=puppet-modules%2Fpuppetlabs-apt.git

Refactored as per mlitteken

* https://github.com/rnavarro/puppet-apt/commit/1af9a13c40c33e1ab8fb56f33cb9aa5e16cead0e#commitcomment-539287
---

1de4e0a2944248897ad92adbdbe88fcd46ec30fb
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 1576927..af6eebf 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -5,7 +5,10 @@ define apt::ppa() {
   Class['apt'] -> Apt::Ppa[$title]
 
   Exec {
-    onlyif => "/usr/bin/test ! $(/bin/ls /etc/apt/sources.list.d | /bin/grep -v $(echo \"${title}\" | /usr/bin/gawk 'match(\$0, /^ppa:(.*)\/(.*)$/, vals) {printf \"%s-%s\", vals[1], vals[2]}'))",
+    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}.*$'",
+    }
   }
 
   exec { "apt-update-${name}":