the default value for sshoptions is 'false' and this value ends up getting

set into the rdiff config, so 'sshoptions = false' which results in the
host attempting to connect to a hostname called 'false'.

This change only includes it if the value is not 'false'.

diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index 0e19125da95df5edac1007259886d5a944dc7dc7..a28917ad52d1fa5fa5877a8caff44c1b061768e2 100644 (file)
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -33,7 +33,7 @@ type = local
     
     if VersionComparer.versioncmp(Puppet.version,'0.24.6') >= 0
         %w{type host directory user sshoptions}.each do |v|
-                if has_variable?(v)
+                if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false"
                 -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
         <%-