diff options
author | Luke Kanies <luke@madstop.com> | 2007-09-23 19:04:31 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2007-09-23 19:04:31 -0500 |
commit | cdc8ea6e81c1b5eba5ea784bb7079c4c1f3965a4 (patch) | |
tree | 6dab031628ee4c8269c93cd96ed646bdd2874cc4 /lib/puppet/util | |
parent | c40da335123ee839294b37134d1e6361000bf216 (diff) | |
download | puppet-cdc8ea6e81c1b5eba5ea784bb7079c4c1f3965a4.tar.gz puppet-cdc8ea6e81c1b5eba5ea784bb7079c4c1f3965a4.tar.xz puppet-cdc8ea6e81c1b5eba5ea784bb7079c4c1f3965a4.zip |
Taking a first stab at moving configuration compiling
into the indirection system. There are still quite
a few unanswered questions, the two most notable
being embodied in unimplemented tests in the Configuration
Code terminus.
This also requires changing the behaviour in a few places.
In particular, 'puppet' and the 'module_puppet' cfengine
module need to store a Node object in memory with the appropriate
classes, since that's now the only way to communicate with
the compiler. That integration work has not yet been done,
partially because the old configuration handler (which the
soon-to-be-deprecated master handler now uses) still exists.
Diffstat (limited to 'lib/puppet/util')
-rw-r--r-- | lib/puppet/util/settings.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index f2af13dc2..1478cd8a5 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -45,15 +45,17 @@ class Puppet::Util::Settings end # A simplified equality operator. - def ==(other) - self.each { |myname, myobj| - unless other[myname] == value(myname) - return false - end - } - - return true - end + # LAK: For some reason, this causes mocha to not be able to mock + # the 'value' method, and it's not used anywhere. +# def ==(other) +# self.each { |myname, myobj| +# unless other[myname] == value(myname) +# return false +# end +# } +# +# return true +# end # Generate the list of valid arguments, in a format that GetoptLong can # understand, and add them to the passed option list. |