diff --git a/manifests/conf.pp b/manifests/conf.pp index 318422e..c37cf6b 100644 --- a/manifests/conf.pp +++ b/manifests/conf.pp @@ -4,8 +4,6 @@ define apt::conf ( $priority = '50' ) { - include apt::params - $apt_conf_d = $apt::params::apt_conf_d file { "${apt_conf_d}/${priority}${name}": diff --git a/manifests/pin.pp b/manifests/pin.pp index 935dc22..a6e3cf8 100644 --- a/manifests/pin.pp +++ b/manifests/pin.pp @@ -16,8 +16,6 @@ define apt::pin( $originator = '', # o= $label = '' # l= ) { - include apt::params - $preferences_d = $apt::params::preferences_d if $order != '' and !is_integer($order) { diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 0fdcc95..f6c7373 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -5,7 +5,6 @@ define apt::ppa( $release = $::lsbdistcodename, $options = $apt::params::ppa_options, ) { - include apt::params include apt::update $sources_list_d = $apt::params::sources_list_d diff --git a/manifests/release.pp b/manifests/release.pp index ae12dd4..d476018 100644 --- a/manifests/release.pp +++ b/manifests/release.pp @@ -3,9 +3,6 @@ class apt::release ( $release_id ) { - - include apt::params - $root = $apt::params::root file { "${root}/apt.conf.d/01release": diff --git a/manifests/source.pp b/manifests/source.pp index f6647df..3e9414f 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -18,8 +18,6 @@ define apt::source( $architecture = undef, $trusted_source = false, ) { - - include apt::params include apt::update validate_string($architecture) diff --git a/manifests/update.pp b/manifests/update.pp index d9b338d..26790ce 100644 --- a/manifests/update.pp +++ b/manifests/update.pp @@ -1,5 +1,4 @@ class apt::update { - include apt::params #TODO: to catch if $::apt_update_last_success has the value of -1 here. If we #opt to do this, a info/warn would likely be all you'd need likely to happen #on the first run, but if it's not run in awhile something is likely borked