diff --git a/apt/manifests/init.pp b/apt/manifests/init.pp index 1b7b218..2a449be 100644 --- a/apt/manifests/init.pp +++ b/apt/manifests/init.pp @@ -20,8 +20,14 @@ class apt { # class apt::ppa::helper { - package { "python-software-properties": - ensure => installed, + if $::operatingsystem == "Ubuntu" and versioncmp($::operatingsystemrelease, "12.04") < 0 { + package { "python-software-properties": + ensure => installed, + } + } else { + package { "software-properties-common": + ensure => installed, + } } } @@ -41,12 +47,13 @@ class apt::ppa::helper { # # apt::ppa { "ppa:igraph/ppa": } # -define apt::ppa($ensure = "present") { +define apt::ppa($ensure="present") { tag("bootstrap") include apt - include apt::ppa::helper + require apt::ppa::helper + $fname = regsubst($name, "^ppa:([^/]+)/(.+)", "\\1-\\2-${::lsbdistcodename}.list") case $ensure { @@ -55,8 +62,7 @@ define apt::ppa($ensure = "present") { path => "/bin:/usr/bin:/sbin:/usr/sbin", user => "root", creates => "/etc/apt/sources.list.d/${fname}", - require => Package["python-software-properties"], - notify => Exec["apt-get-update"], + notify => Exec["apt-get update"], } } "absent": {