Commit 04f10d33 authored by Micah Anderson's avatar Micah Anderson

remove the versioncmp function in the rdiff handler. This was a nice attempt...

remove the versioncmp function in the rdiff handler. This was a nice attempt to try and support older
puppets, but this functionality has not stabilized yet, 0.24.8 broke versioncmp and there looks like
a new way coming. Its easier to be mean.
parent fa4a86a8
......@@ -28,25 +28,9 @@ type = local
<% end -%>
[dest]
<%- include Puppet::Util::Package
class VersionComparer; extend Puppet::Util::Package; end
if VersionComparer.versioncmp(Puppet.version,'0.24.6') >= 0
%w{type host directory user sshoptions}.each do |v|
if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false"
-%>
<%- %w{type host directory user sshoptions}.each do |v|
if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
<%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
<%-
end
end
%>
<%- else -%>
<%- %w{type host directory user sshoptions}.each do |v|
if @scope.lookupvar(v)
-%>
<%= v + ' = ' + @scope.lookupvar(v) %>
<%-
end
end
%>
<%- end -%>
<%-
end
end -%>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment