X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fforce.pp;h=8ceeb17060a57cf68d50a6681542cde134ecd7ce;hb=396e11af3a0ee7d0b5820a136bdb17f2ea4bf41b;hp=0089bbd75393d02044e62427a7470a0528405b31;hpb=4a788a60f913d5d7934aef9fa0eda68152a3e8b3;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/force.pp b/manifests/force.pp
index 0089bbd..8ceeb17 100644
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -2,20 +2,59 @@
 # force a package from a specific release
 
 define apt::force(
-  $release = 'testing',
-  $version = false
+  $release     = false,
+  $version     = false,
+  $timeout     = 300,
+  $cfg_files   = 'none',
+  $cfg_missing = false,
 ) {
 
+  validate_re($cfg_files, ['^new', '^old', '^unchanged', '^none'])
+  validate_bool($cfg_missing)
+
+  $provider = $apt::params::provider
+
   $version_string = $version ? {
     false   => undef,
     default => "=${version}",
   }
 
-  $install_check = $version ? {
-    false   => "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'",
-    default => "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'",
+  $release_string = $release ? {
+    false   => undef,
+    default => "-t ${release}",
+  }
+
+  case $cfg_files {
+    'new':           { $config_files = '-o Dpkg::Options::="--force-confnew"' }
+    'old':           { $config_files = '-o Dpkg::Options::="--force-confold"' }
+    'unchanged':     { $config_files = '-o Dpkg::Options::="--force-confdef"' }
+    'none', default: { $config_files = '' }
   }
-  exec { "/usr/bin/aptitude -y -t ${release} install ${name}${version_string}":
-    unless => $install_check,
+
+  case $cfg_missing {
+    true:           { $config_missing = '-o Dpkg::Options::="--force-confmiss"' }
+    false, default: { $config_missing = '' }
+  }
+
+  if $version == false {
+    if $release == false {
+      $install_check = "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'"
+    } else {
+      # If installed version and candidate version differ, this check returns 1 (false).
+      $install_check = "/usr/bin/test \$(/usr/bin/apt-cache policy -t ${release} ${name} | /bin/grep -E 'Installed|Candidate' | /usr/bin/uniq -s 14 | /usr/bin/wc -l) -eq 1"
+    }
+  } else {
+    if $release == false {
+      $install_check = "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'"
+    } else {
+      $install_check = "/usr/bin/apt-cache policy -t ${release} ${name} | /bin/grep -q 'Installed: ${version}'"
+    }
+  }
+
+  exec { "${provider} -y ${config_files} ${config_missing} ${release_string} install ${name}${version_string}":
+    unless      => $install_check,
+    environment => ['LC_ALL=C', 'LANG=C'],
+    logoutput   => 'on_failure',
+    timeout     => $timeout,
   }
 }