X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fforce.pp;h=8ceeb17060a57cf68d50a6681542cde134ecd7ce;hb=4802a6fc776122d1ea77f1a5904b78442dcc205f;hp=a73f7ab218ce4a1dc8b691cf73059e06cdacbe77;hpb=5d96da0c6aac8f0f9192fe6ce63548bdaee149b5;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/force.pp b/manifests/force.pp index a73f7ab..8ceeb17 100644 --- a/manifests/force.pp +++ b/manifests/force.pp @@ -25,15 +25,15 @@ define apt::force( } 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': { $config_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 = '' } } case $cfg_missing { - true: { $config_missing = '-o Dpkg::Options::="--force-confmiss"' } - false: { $config_missing = '' } + true: { $config_missing = '-o Dpkg::Options::="--force-confmiss"' } + false, default: { $config_missing = '' } } if $version == false { @@ -52,8 +52,9 @@ define apt::force( } exec { "${provider} -y ${config_files} ${config_missing} ${release_string} install ${name}${version_string}": - unless => $install_check, - logoutput => 'on_failure', - timeout => $timeout, + unless => $install_check, + environment => ['LC_ALL=C', 'LANG=C'], + logoutput => 'on_failure', + timeout => $timeout, } }