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
Cleaned up unit tests.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index caff436bdf542c7fbaa23a5752ef81feb7912158..5f5c6ae57421993afa99705d3d63b6de081fd066 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-1,10
+1,10
@@
# ppa.pp
define apt::ppa(
# ppa.pp
define apt::ppa(
+ $ensure = 'present',
$release = $::lsbdistcodename,
$release = $::lsbdistcodename,
- $options =
'-y'
+ $options =
$apt::params::ppa_options,
) {
) {
- $ensure = 'present'
include apt::params
include apt::update
include apt::params
include apt::update
@@
-15,7
+15,7
@@
define apt::ppa(
}
if $::operatingsystem != 'Ubuntu' {
}
if $::operatingsystem != 'Ubuntu' {
- fail(
"apt::ppa is currently supported on Ubuntu only."
)
+ fail(
'apt::ppa is currently supported on Ubuntu only.'
)
}
$filename_without_slashes = regsubst($name, '/', '-', 'G')
}
$filename_without_slashes = regsubst($name, '/', '-', 'G')
@@
-36,11
+36,13
@@
define apt::ppa(
if defined(Class[apt]) {
$proxy_host = $apt::proxy_host
$proxy_port = $apt::proxy_port
if defined(Class[apt]) {
$proxy_host = $apt::proxy_host
$proxy_port = $apt::proxy_port
- case
$proxy_host {
-
false, ''
: {
+ case $proxy_host {
+
false, '', undef
: {
$proxy_env = []
$proxy_env = []
- }
- default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
+ }
+ default: {
+ $proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]
+ }
}
} else {
$proxy_env = []
}
} else {
$proxy_env = []