Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update manifests/init.pp
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index 0458589849e30ec90dcc8f7a7d6f0d73ef6f3c32..725170d2dc39dfb9c8b51841b795a8d467cb480c 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-17,8
+17,13
@@
define apt::ppa(
$filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', G)
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
$filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', G)
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
- if ! defined(Package['python-software-properties']) {
- package { 'python-software-properties': }
+ $package = $::lsbdistrelease ? {
+ /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
+ default => 'software-properties-common',
+ }
+
+ if ! defined(Package[$package]) {
+ package { $package: }
}
exec { "add-apt-repository-${name}":
}
exec { "add-apt-repository-${name}":
@@
-27,7
+32,7
@@
define apt::ppa(
logoutput => 'on_failure',
require => [
File[$sources_list_d],
logoutput => 'on_failure',
require => [
File[$sources_list_d],
- Package[
'python-software-properties'
],
+ Package[
"${package}"
],
],
notify => Exec['apt_update'],
}
],
notify => Exec['apt_update'],
}
@@
-42,4
+47,3
@@
define apt::ppa(
require => Class['apt::update'],
}
}
require => Class['apt::update'],
}
}
-