[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit f48a0ae140661dc14934c0a192c71687929b0624
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Wed Aug 13 17:02:35 2008 +0200

    Fix #1510 - storeconfig fails with rails 2.1
    
    This is a workaround.
    Since rails seems to have difficulties to map associations to
    Puppet classes, we explain it carefully what to expect.
    
    Changelog

diff --git a/CHANGELOG b/CHANGELOG
index f1284ae..b76d33e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Fixed #1510 - Storeconfiguration fixed for Rails 2.1
+
     Add the -P/--ping option to puppetrun, fixes #1501
 
     Fixed #1394 - Added stored configuration clearing script to /ext
diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb
index 0053dc2..eabc873 100644
--- a/lib/puppet/rails/resource.rb
+++ b/lib/puppet/rails/resource.rb
@@ -6,12 +6,12 @@ require 'puppet/util/rails/collection_merger'
 class Puppet::Rails::Resource < ActiveRecord::Base
     include Puppet::Util::CollectionMerger
 
-    has_many :param_values, :dependent => :destroy
-    has_many :param_names, :through => :param_values
+    has_many :param_values, :dependent => :destroy, :class_name => "Puppet::Rails::ParamValue"
+    has_many :param_names, :through => :param_values, :class_name => "Puppet::Rails::ParamName"
+
+    has_many :resource_tags, :dependent => :destroy, :class_name => "Puppet::Rails::ResourceTag"
+    has_many :puppet_tags, :through => :resource_tags, :class_name => "Puppet::Rails::PuppetTag"
 
-    has_many :resource_tags, :dependent => :destroy
-    has_many :puppet_tags, :through => :resource_tags
-    
     belongs_to :source_file
     belongs_to :host
 

-- 
Puppet packaging for Debian