From: Micah Anderson <micah@riseup.net>
Date: Tue, 14 Apr 2009 19:56:53 +0000 (-0400)
Subject: remove the versioncmp function in the rdiff handler. This was a nice attempt to try... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=04f10d333b4978a2ce71782c3d94fc2a08f33573;p=puppet-backupninja.git

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.
---

diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index a28917a..a41e969 100644
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -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 -%>