X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;h=61caa34e5feb89a9bcd80a2303a909823d9b6b2b;hb=refs%2Fheads%2Frelease-prep;hp=b68ac66910054db6b82d54e141239c69971f077f;hpb=a8b0421fa4a85ca19ffb170c398184cac02c8aa6;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index b68ac66..61caa34 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -40,7 +40,7 @@ define apt::ppa ( } # 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}") } @@ -73,7 +73,7 @@ define apt::ppa ( 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'] @@ -111,6 +111,7 @@ define apt::ppa ( logoutput => 'on_failure', notify => Class['apt::update'], require => $_require, + before => File["${apt::sources_list_d}/${sources_list_d_filename}"], } }