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
Release prep v9.1.0
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index f6cba8d38abff2d597797b7ac98f9627f9d5def0..61caa34e5feb89a9bcd80a2303a909823d9b6b2b 100644
(file)
--- a/
manifests/ppa.pp
+++ b/
manifests/ppa.pp
@@
-40,7
+40,7
@@
define apt::ppa (
}
# Validate the resource name
}
# Validate the resource name
- if $name !~ /^ppa:([a-zA-Z0-9\-_
]+)\/([a-zA-z0-9\-_
]+)$/ {
+ if $name !~ /^ppa:([a-zA-Z0-9\-_
.]+)\/([a-zA-z0-9\-_\.
]+)$/ {
fail("Invalid PPA name: ${name}")
}
fail("Invalid PPA name: ${name}")
}
@@
-73,7
+73,7
@@
define apt::ppa (
if $ensure == 'present' {
if $package_manage {
if $ensure == 'present' {
if $package_manage {
- ensure_packages($package_name)
+
stdlib::
ensure_packages($package_name)
$_require = [File['sources.list.d'], Package[$package_name]]
} else {
$_require = File['sources.list.d']
$_require = [File['sources.list.d'], Package[$package_name]]
} else {
$_require = File['sources.list.d']
@@
-111,8
+111,11
@@
define apt::ppa (
logoutput => 'on_failure',
notify => Class['apt::update'],
require => $_require,
logoutput => 'on_failure',
notify => Class['apt::update'],
require => $_require,
+ before => File["${apt::sources_list_d}/${sources_list_d_filename}"],
}
}
}
}
+
+ file { "${apt::sources_list_d}/${sources_list_d_filename}": }
}
else {
tidy { "remove-apt-repository-script-${name}":
}
else {
tidy { "remove-apt-repository-script-${name}":