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
MODULES-2889 - remove unneeded whitespace in source.list template
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index 5fc7f3c50384d911585e0345e8c5060ba4377ba5..6352352c8d54711baeffecb0871c0dfa17bfc4eb 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-10,8
+10,8
@@
define apt::ppa(
fail('lsbdistcodename fact not available: release parameter required')
}
fail('lsbdistcodename fact not available: release parameter required')
}
- if $::apt::
distid != 'ubuntu
' {
- fail('apt::ppa is
currently supported on Ubuntu and LinuxMint 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'],
- }
}
}