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 #1110 from puppetlabs/CONT-581
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
ppa.pp
diff --git
a/manifests/ppa.pp
b/manifests/ppa.pp
index b68ac66910054db6b82d54e141239c69971f077f..2a5b4a868de955037e5e42c1c842e1fffa387662 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}")
}
@@
-111,6
+111,7
@@
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}"],
}
}
}
}