diff options
| author | Micah Anderson <micah@riseup.net> | 2009-04-14 15:56:53 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-04-14 15:56:53 -0400 |
| commit | 04f10d333b4978a2ce71782c3d94fc2a08f33573 (patch) | |
| tree | 36153e707bd4e7c972197c7d4f703e8bab22666d /templates | |
| parent | fa4a86a8a6ef0d95475544c9c3bbc67af5bf9f45 (diff) | |
| download | puppet-backupninja-04f10d333b4978a2ce71782c3d94fc2a08f33573.tar.gz puppet-backupninja-04f10d333b4978a2ce71782c3d94fc2a08f33573.tar.bz2 | |
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.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/rdiff.conf.erb | 26 |
1 files changed, 5 insertions, 21 deletions
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 -%> |