X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=tasks%2Finit.rb;h=86367d939629d02686d88297012026f491ff86fa;hb=db80422699df8dc045d6516d87917119acce15b0;hp=b4cb0dc7622744be6334972eeb720ae1d89faf08;hpb=d6069a619ce1b30f19014932f81e83f445c846e6;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/tasks/init.rb b/tasks/init.rb
index b4cb0dc..86367d9 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -1,13 +1,22 @@
 #!/opt/puppetlabs/puppet/bin/ruby
+# frozen_string_literal: true
+
 require 'json'
 require 'open3'
 require 'puppet'
 
 def apt_get(action)
   cmd = ['apt-get', action]
-  cmd << '-y' if action == 'upgrade'
+  cmd << '-y' if ['upgrade', 'dist-upgrade', 'autoremove'].include?(action)
+  if ['upgrade', 'dist-upgrade'].include?(action)
+    ENV['DEBIAN_FRONTEND'] = 'noninteractive'
+    cmd << '-o'
+    cmd << 'Dpkg::Options="--force-confdef"'
+    cmd << '-o'
+    cmd << 'Dpkg::Options="--force-confold"'
+  end
   stdout, stderr, status = Open3.capture3(*cmd)
-  raise Puppet::Error, stderr if status != 0 # rubocop:disable GetText/DecorateFunctionMessage
+  raise Puppet::Error, stderr if status != 0
   { status: stdout.strip }
 end