From: Micah Anderson <micah@riseup.net>
Date: Mon, 8 Dec 2008 20:35:30 +0000 (-0500)
Subject: setup rdiff handler template to work properly for different versions of puppet
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=72493d7caa635eb8ef210bc0a402b5579f85d98c;p=puppet-backupninja.git

setup rdiff handler template to work properly for different versions of puppet
---

diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index 7fbfe73..0e19125 100644
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -28,8 +28,25 @@ type = local
 <% end -%>
 
 [dest]
-<% %w{type host directory user sshoptions}.each do |v|
-	if has_variable?(v)
-		-%><%= v + ' = ' + instance_variable_get("@#{v}") + "\n" %><%
-	end
-end -%>
+<%- 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)
+                -%>
+<%= 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 -%>