Merge pull request #49 from nanliu/tb/11966

(#11966) Only invoke apt-get update once.

manifests/backports.pp

@@ -41,6 +41,5 @@
     },
     key_server => 'pgp.mit.edu',
     pin        => '200',
-    notify     => Exec['apt_update'],
   }
 }

manifests/builddep.pp

@@ -1,16 +1,12 @@
 # builddep.pp
 
 define apt::builddep() {
+  include apt::update
 
   Class['apt'] -> Apt::Builddep[$name]
 
-  exec { "apt-update-${name}":
-    command     => '/usr/bin/apt-get update',
-    refreshonly => true,
-  }
-
   exec { "apt-builddep-${name}":
     command => "/usr/bin/apt-get -y --force-yes build-dep ${name}",
-    notify  => Exec["apt-update-${name}"],
+    notify  => Exec['apt_update'],
   }
 }

manifests/init.pp

@@ -29,14 +29,10 @@
 ) {
 
   include apt::params
+  include apt::update
 
   validate_bool($purge_sources_list, $purge_sources_list_d)
 
-  $refresh_only_apt_update = $always_apt_update? {
-    true  => false,
-    false => true,
-  }
-
   if ! defined(Package['python-software-properties']) {
     package { 'python-software-properties': }
   }
@@ -46,6 +42,12 @@
     true  => "# Repos managed by puppet.\n",
   }
 
+  if $always_apt_update == true {
+    Exec <| title=='apt_update' |> {
+      refreshonly => false,
+    }
+  }
+
   $root           = $apt::params::root
   $apt_conf_d     = $apt::params::apt_conf_d
   $sources_list_d = $apt::params::sources_list_d
@@ -58,6 +60,7 @@
     group   => root,
     mode    => '0644',
     content => $sources_list_content,
+    notify  => Exec['apt_update'],
   }
 
   file { 'sources.list.d':
@@ -67,12 +70,7 @@
     group   => root,
     purge   => $purge_sources_list_d,
     recurse => $purge_sources_list_d,
-  }
-
-  exec { 'apt_update':
-    command     => "${provider} update",
-    subscribe   => [ File['sources.list'], File['sources.list.d'] ],
-    refreshonly => $refresh_only_apt_update,
+    notify  => Exec['apt_update'],
   }
 
   case $disable_keys {
@@ -89,7 +87,7 @@
         path   => "${apt_conf_d}/99unauth",
       }
     }
-    undef: { } # do nothing
+    undef:   { } # do nothing
     default: { fail('Valid values for disable_keys are true or false') }
   }
 

manifests/ppa.pp

@@ -7,26 +7,23 @@
   Class['apt'] -> Apt::Ppa[$title]
 
   include apt::params
+  include apt::update
 
   $sources_list_d = $apt::params::sources_list_d
 
   if ! $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
-  exec { "apt-update-${name}":
-    command     => "${apt::params::provider} update",
-    refreshonly => true,
-  }
 
   $filename_without_slashes = regsubst($name,'/','-','G')
   $filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
   $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
 
   exec { "add-apt-repository-${name}":
     command => "/usr/bin/add-apt-repository ${name}",
-    notify  => Exec["apt-update-${name}"],
     creates => "${sources_list_d}/${sources_list_d_filename}",
+    notify  => Exec['apt_update'],
   }
 
   file { "${sources_list_d}/${sources_list_d_filename}":

manifests/source.pp

@@ -16,6 +16,7 @@
 ) {
 
   include apt::params
+  include apt::update
 
   $sources_list_d = $apt::params::sources_list_d
   $provider       = $apt::params::provider
@@ -31,6 +32,7 @@
     group   => root,
     mode    => '0644',
     content => template("${module_name}/source.list.erb"),
+    notify  => Exec['apt_update'],
   }
 
   if ($pin != false) and ($ensure == 'present') {
@@ -40,12 +42,6 @@
     }
   }
 
-  exec { "${name} apt update":
-    command     => "${provider} update",
-    subscribe   => File["${name}.list"],
-    refreshonly => true,
-  }
-
   if ($required_packages != false) and ($ensure == 'present') {
     exec { "Required packages: '${required_packages}' for ${name}":
       command     => "${provider} -y install ${required_packages}",

manifests/update.pp

@@ -0,0 +1,8 @@
+class apt::update {
+  include apt::params
+
+  exec { 'apt_update':
+    command     => "${apt::params::provider} update",
+    refreshonly => true,
+  }
+}

spec/classes/apt_spec.rb

@@ -72,7 +72,8 @@
             'owner'   => "root",
             'group'   => "root",
             'purge'   => true,
-            'recurse' => true
+            'recurse' => true,
+            'notify'  => 'Exec[apt_update]'
           })
         else
           should create_file("sources.list.d").with({
@@ -81,15 +82,15 @@
             'owner'   => "root",
             'group'   => "root",
             'purge'   => false,
-            'recurse' => false
+            'recurse' => false,
+            'notify'  => 'Exec[apt_update]'
           })
         end
       }
 
       it {
         should contain_exec("apt_update").with({
           'command'     => "/usr/bin/apt-get update",
-          'subscribe'   => ["File[sources.list]", "File[sources.list.d]"],
           'refreshonly' => refresh_only_apt_update
         })
       }

spec/classes/backports_spec.rb

@@ -17,7 +17,6 @@
         'key'        => '437D05B5',
         'key_server' => 'pgp.mit.edu',
         'pin'        => '200',
-        'notify'     => 'Exec[apt_update]'
       })
     }
   end
@@ -38,7 +37,6 @@
         'key'        => '55BE302B',
         'key_server' => 'pgp.mit.edu',
         'pin'        => '200',
-        'notify'     => 'Exec[apt_update]'
       })
     }
   end
@@ -67,7 +65,6 @@
         'key'        => '55BE302B',
         'key_server' => 'pgp.mit.edu',
         'pin'        => '200',
-        'notify'     => 'Exec[apt_update]'
       })
     }
   end

spec/defines/builddep_spec.rb

@@ -6,7 +6,7 @@
   describe "should succeed with a Class['apt']" do
     let(:pre_condition) { 'class {"apt": } ' }
 
-    it { should contain_exec("apt-update-#{title}").with({
+    it { should contain_exec("apt_update").with({
         'command' => "/usr/bin/apt-get update",
         'refreshonly' => true
       })

spec/defines/ppa_spec.rb

@@ -18,15 +18,15 @@
         t.sub(/^ppa:/,'').gsub('/','-') << "-" << "#{release}.list"
       end
 
-      it { should contain_exec("apt-update-#{t}").with(
+      it { should contain_exec("apt_update").with(
         'command'     => '/usr/bin/apt-get update',
         'refreshonly' => true
         )
       }
 
       it { should contain_exec("add-apt-repository-#{t}").with(
         'command' => "/usr/bin/add-apt-repository #{t}",
-        'notify'  => "Exec[apt-update-#{t}]",
+        'notify'  => "Exec[apt_update]",
         'creates' => "/etc/apt/sources.list.d/#{filename}"
         )
       }

spec/defines/source_spec.rb

@@ -97,9 +97,8 @@
       }
 
       it {
-        should contain_exec("#{title} apt update").with({
+        should contain_exec("apt_update").with({
           "command"     => "/usr/bin/apt-get update",
-          "subscribe"   => "File[#{title}.list]",
           "refreshonly" => true
         })
       }