e3784987fc
apt::ppa and apt::builddep requires apt class. The anchor introduced for containment of apt-get update causes a dependency loop. apt::ppa appears to depend on apt class sources.d direcory. While apt::builddep have no clear reason for a dependency on apt class. This change refactor both define type, so they no longer cause a dependency loop.
41 lines
1.1 KiB
Puppet
41 lines
1.1 KiB
Puppet
# ppa.pp
|
|
|
|
define apt::ppa(
|
|
$release = $::lsbdistcodename
|
|
) {
|
|
include apt::params
|
|
include apt::update
|
|
|
|
$sources_list_d = $apt::params::sources_list_d
|
|
|
|
if ! $release {
|
|
fail('lsbdistcodename fact not available: release parameter required')
|
|
}
|
|
|
|
$filename_without_slashes = regsubst($name,'/','-','G')
|
|
$filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
|
|
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
|
|
|
|
if ! defined(Package['python-software-properties']) {
|
|
package { 'python-software-properties': }
|
|
}
|
|
|
|
exec { "add-apt-repository-${name}":
|
|
command => "/usr/bin/add-apt-repository ${name}",
|
|
creates => "${sources_list_d}/${sources_list_d_filename}",
|
|
require => [ File[$sources_list_d],
|
|
Package['python-software-properties'] ],
|
|
notify => Exec['apt_update'],
|
|
}
|
|
|
|
file { "${sources_list_d}/${sources_list_d_filename}":
|
|
ensure => file,
|
|
require => Exec["add-apt-repository-${name}"],
|
|
}
|
|
|
|
# Need anchor to provide containment for dependencies.
|
|
anchor { "apt::ppa::${name}":
|
|
require => Class['apt::update'],
|
|
}
|
|
}
|
|
|