diff options
| author | Luke Kanies <luke@madstop.com> | 2009-02-06 17:52:34 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-02-06 18:08:44 -0600 |
| commit | 53357884111d3499746b292f99948d5eb3c83415 (patch) | |
| tree | 063ea361e228b5bf711a3b96ef2faa84bb74fce0 /lib | |
| parent | 08a5d492dd3545366a2850d568d87aad0ba884e6 (diff) | |
| download | puppet-53357884111d3499746b292f99948d5eb3c83415.tar.gz puppet-53357884111d3499746b292f99948d5eb3c83415.tar.xz puppet-53357884111d3499746b292f99948d5eb3c83415.zip | |
Fixing tests broken during the #1405 fix.
Most of these were small changes, like moved methods.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/resource.rb | 10 | ||||
| -rw-r--r-- | lib/puppet/resource/catalog.rb | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb index b8347f8d7..add32b7cf 100644 --- a/lib/puppet/resource.rb +++ b/lib/puppet/resource.rb @@ -29,6 +29,16 @@ class Puppet::Resource @parameters[parameter_name(param)] end + # Compatibility method. + def builtin? + builtin_type? + end + + # Is this a builtin resource type? + def builtin_type? + @reference.builtin_type? + end + # Iterate over each param/value pair, as required for Enumerable. def each @parameters.each { |p,v| yield p, v } diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index d50241d6c..78f6a6f79 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -469,6 +469,8 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph def to_catalog(convert) result = self.class.new(self.name) + result.version = self.version + map = {} vertices.each do |resource| next if resource.respond_to?(:virtual?) and resource.virtual? |