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
Merge pull request #560 from mhaskel/MODULES-2446
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index 4a08dce6fd413134590962f8ad11091b171f5958..6352352c8d54711baeffecb0871c0dfa17bfc4eb 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-1,17
+1,17
@@
# ppa.pp
define apt::ppa(
$ensure = 'present',
# ppa.pp
define apt::ppa(
$ensure = 'present',
- $release = $::lsbdistcodename,
$options = $::apt::ppa_options,
$options = $::apt::ppa_options,
+ $release = $::apt::xfacts['lsbdistcodename'],
$package_name = $::apt::ppa_package,
$package_manage = false,
) {
$package_name = $::apt::ppa_package,
$package_manage = false,
) {
-
if !
$release {
+
unless
$release {
fail('lsbdistcodename fact not available: release parameter required')
}
fail('lsbdistcodename fact not available: release parameter required')
}
- if $::
operatingsystem != 'Ubuntu
' {
- fail('apt::ppa is
currently supported on Ubuntu only
.')
+ if $::
apt::xfacts['lsbdistid'] == 'Debian
' {
+ fail('apt::ppa is
not currently supported on Debian
.')
}
$filename_without_slashes = regsubst($name, '/', '-', 'G')
}
$filename_without_slashes = regsubst($name, '/', '-', 'G')
@@
-31,9
+31,9
@@
define apt::ppa(
$_proxy = $::apt::_proxy
if $_proxy['host'] {
if $_proxy['https'] {
$_proxy = $::apt::_proxy
if $_proxy['host'] {
if $_proxy['https'] {
- $_proxy_env = ["http_proxy=http://${
_proxy['host']}:${_proxy['port']}", "https_proxy=https://${_proxy['host']}:${
_proxy['port']}"]
+ $_proxy_env = ["http_proxy=http://${
$_proxy['host']}:${$_proxy['port']}", "https_proxy=https://${$_proxy['host']}:${$
_proxy['port']}"]
} else {
} else {
- $_proxy_env = ["http_proxy=http://${
_proxy['host']}:${
_proxy['port']}"]
+ $_proxy_env = ["http_proxy=http://${
$_proxy['host']}:${$
_proxy['port']}"]
}
} else {
$_proxy_env = []
}
} else {
$_proxy_env = []
@@
-45,7
+45,7
@@
define apt::ppa(
unless => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
user => 'root',
logoutput => 'on_failure',
unless => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
user => 'root',
logoutput => 'on_failure',
- notify =>
Exec['apt_
update'],
+ notify =>
Class['apt::
update'],
require => $_require,
}
require => $_require,
}
@@
-57,12
+57,7
@@
define apt::ppa(
else {
file { "${::apt::sources_list_d}/${sources_list_d_filename}":
ensure => 'absent',
else {
file { "${::apt::sources_list_d}/${sources_list_d_filename}":
ensure => 'absent',
- notify =>
Exec['apt_
update'],
+ notify =>
Class['apt::
update'],
}
}
}
}
-
- # Need anchor to provide containment for dependencies.
- anchor { "apt::ppa::${name}":
- require => Class['apt::update'],
- }
}
}