From 7dc9212ec0c14cb8f9c63d3960c322887eec51d4 Mon Sep 17 00:00:00 2001 From: Danny van der Meulen Date: Fri, 24 Jan 2014 00:32:25 +0100 Subject: [PATCH 1/3] . --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index 638c347b17..deecec3d1b 100644 --- a/LICENSE +++ b/LICENSE @@ -17,3 +17,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + From dfd328a9bf4a911ee4267c610c5637d01bed6f32 Mon Sep 17 00:00:00 2001 From: Danny van der Meulen Date: Fri, 24 Jan 2014 11:27:59 +0100 Subject: [PATCH 2/3] revert to 148fc7342caaf6266dffd080b43219f4489fd0c1 --- LICENSE | 1 - 1 file changed, 1 deletion(-) diff --git a/LICENSE b/LICENSE index deecec3d1b..638c347b17 100644 --- a/LICENSE +++ b/LICENSE @@ -17,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - From 0203f31dbd62e5ac3301892fe45bae45aab3cc88 Mon Sep 17 00:00:00 2001 From: Danny van der Meulen Date: Fri, 24 Jan 2014 11:32:41 +0100 Subject: [PATCH 3/3] apt::ppa: Don't run when ppa source file exists --- manifests/ppa.pp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 9c277e9bd4..678ca6ab80 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -5,14 +5,19 @@ ) { require apt + $ppa = regsubst($name, '^(ppa:)(.*)$', '\2') + $ppa_apt_name = regsubst($ppa, '/', '-', 'G') + $ppa_list_file = "${ppa_apt_name}-${::lsbdistcodename}.list" + exec { "apt-update-${name}": - command => "/usr/bin/aptitude update", + command => '/usr/bin/aptitude update', refreshonly => true, } exec { "add-apt-repository-${name}": command => "/usr/bin/add-apt-repository ${name}", - notify => Exec["apt-update-${name}"], + creates => "/etc/apt/sources.list.d/${ppa_list_file}", + notify => Exec["apt-update-${name}"]; } }