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 #145 from PierreGambarotto/master
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index db312ea13583e2f01e8c8232605d7901fafbba45..92b6c0e0b28e131af31b3d0903d6de1882aca896 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-31,13
+31,13
@@
define apt::ppa(
$proxy_host = getparam(Class[apt], "proxy_host")
$proxy_port = getparam(Class[apt], "proxy_port")
case $proxy_host {
$proxy_host = getparam(Class[apt], "proxy_host")
$proxy_port = getparam(Class[apt], "proxy_port")
case $proxy_host {
- false: {
- $proxy_env =
""
+ false
, ""
: {
+ $proxy_env =
[]
}
default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
}
} else {
}
default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
}
} else {
- $proxy_env =
""
+ $proxy_env =
[]
}
exec { "add-apt-repository-${name}":
environment => $proxy_env,
}
exec { "add-apt-repository-${name}":
environment => $proxy_env,