X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Falternative.pp;h=1a40c1575ffe8e3993d2527747e904ab56e3522a;hb=a212c6563eca103b65f5d999a70ed05d5f2231cc;hp=d7488bee348d2880584574009e1db780ba0f37aa;hpb=19c567d5109b124b1c5d7126e645f9fbd9f39199;p=mirror%2Fdsa-puppet.git diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp index d7488bee3..1a40c1575 100644 --- a/modules/site/manifests/alternative.pp +++ b/modules/site/manifests/alternative.pp @@ -3,7 +3,7 @@ define site::alternative ($linkto, $ensure = present) { present: { if $::lsbdistcodename == 'lenny' { exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}": - unless => "[ $(basename $(readlink -f /etc/alternatives/${name})) = ${linkto} ]", + unless => "[ $(readlink -f /etc/alternatives/${name}) = ${linkto} ]", } } else { exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}": @@ -14,7 +14,7 @@ define site::alternative ($linkto, $ensure = present) { absent: { if $::lsbdistcodename == 'lenny' { exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}": - unless => "[ $(basename $(readlink -f /etc/alternatives/${name})) != ${linkto} ]", + unless => "[ $(readlink -f /etc/alternatives/${name}) != ${linkto} ]", } } else { exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":