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 #583 from tdb/fix_ppa_pluses
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index 808c9751a042b32196dfc8c918216699f5085748..d6b49007608c2f6811d3d4d812b017a200727173 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-16,7
+16,8
@@
define apt::ppa(
$filename_without_slashes = regsubst($name, '/', '-', 'G')
$filename_without_dots = regsubst($filename_without_slashes, '\.', '_', 'G')
$filename_without_slashes = regsubst($name, '/', '-', 'G')
$filename_without_dots = regsubst($filename_without_slashes, '\.', '_', 'G')
- $filename_without_ppa = regsubst($filename_without_dots, '^ppa:', '', 'G')
+ $filename_without_pluses = regsubst($filename_without_dots, '\+', '_', 'G')
+ $filename_without_ppa = regsubst($filename_without_pluses, '^ppa:', '', 'G')
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
if $ensure == 'present' {
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
if $ensure == 'present' {
@@
-31,9
+32,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
+46,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,7
+58,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'],
}
}
}
}
}
}