summaryrefslogtreecommitdiffstats
path: root/lib/puppet/feature
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-08-27 14:26:49 -0500
committerLuke Kanies <luke@madstop.com>2007-08-27 14:26:49 -0500
commit1de5ae0da0d336f1b96ceaac5aca1dfed4169460 (patch)
tree9a302b3e786ba320c6d668bc93387044027e6092 /lib/puppet/feature
parent11081ce8864dca2bc92d8c9f825c3fe7f96333f4 (diff)
downloadpuppet-1de5ae0da0d336f1b96ceaac5aca1dfed4169460.tar.gz
puppet-1de5ae0da0d336f1b96ceaac5aca1dfed4169460.tar.xz
puppet-1de5ae0da0d336f1b96ceaac5aca1dfed4169460.zip
Adding support for providing a diff when files are being changed. Currently uses a local diff binary, but could easily be changed to use the ruby diff/lcs library. Modified puppet and puppetd to automatically show file diffs when in noop mode, but can otherwise be enabled using --show_diff. This only works when running interactively, because the diffs are printed on stdout.
Diffstat (limited to 'lib/puppet/feature')
-rw-r--r--lib/puppet/feature/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb
index 97200cb39..6368d0931 100644
--- a/lib/puppet/feature/base.rb
+++ b/lib/puppet/feature/base.rb
@@ -20,4 +20,5 @@ Puppet.features.add(:root) { require 'puppet/util/suidmanager'; Puppet::Util::SU
# We've got mongrel available
Puppet.features.add(:mongrel, :libs => %w{rubygems mongrel puppet/network/server/mongrel})
-# $Id$
+# We have lcs diff
+Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk}