]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
not basename
authorStephen Gran <steve@lobefin.net>
Fri, 6 Apr 2012 05:20:19 +0000 (06:20 +0100)
committerStephen Gran <steve@lobefin.net>
Fri, 6 Apr 2012 05:20:19 +0000 (06:20 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/site/manifests/alternative.pp

index d7488bee348d2880584574009e1db780ba0f37aa..1a40c1575ffe8e3993d2527747e904ab56e3522a 100644 (file)
@@ -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}":