[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. b41024e984a40d157beb6e2c41061d3f2f9fc089

[Micah Anderson]

The following commit has been merged in the master branch:
commit 18a6325a4bba89380fbb92824436268494df47f6
Author: Micah Anderson <micah at riseup.net>
Date:   Tue Mar 11 23:58:03 2008 -0400

    merge updates from 0.24.x, getting us up to 0.24.3rc1

diff --git a/CHANGELOG b/CHANGELOG
index c7e443e..a710e20 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+    The change in checksums from 'timestamp' to 'mtime' no longer
+    result in updates on every run (#1116).
+
+    Aliases again work in relationships (#1094).
+
+    The CA serial file will no longer ever be owned by
+    root (#1041).
+
     Fixing the rest of #1113: External node commands can specify
     an environment and Puppet will now use it.
 
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb
index f885a41..ecda472 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/node/catalog.rb
@@ -84,6 +84,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
 
     # Create an alias for a resource.
     def alias(resource, name)
+        #set $1 
         resource.ref =~ /^(.+)\[/
 
         newref = "%s[%s]" % [$1 || resource.class.name, name]
@@ -475,6 +476,15 @@ class Puppet::Node::Catalog < Puppet::PGraph
         vertices.each do |resource|
             next if resource.respond_to?(:virtual?) and resource.virtual?
 
+            #This is hackity hack for 1094
+            #Aliases aren't working in the ral catalog because the current instance of the resource
+            #has a reference to the catalog being converted. . . So, give it a reference to the new one
+            #problem solved. . .
+            if resource.is_a?(Puppet::TransObject)
+                resource = resource.dup
+                resource.catalog = result
+            end
+
             newres = resource.send(convert)
 
             # We can't guarantee that resources don't munge their names
diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb
index dacf037..fe8bde9 100755
--- a/lib/puppet/type/tidy.rb
+++ b/lib/puppet/type/tidy.rb
@@ -1,5 +1,5 @@
 module Puppet
-    newtype(:tidy, Puppet.type(:file)) do
+    newtype(:tidy, :parent => Puppet.type(:file)) do
         @doc = "Remove unwanted files based on specific criteria.  Multiple
             criteria are OR'd together, so a file that is too large but is not
             old enough will still get tidied."
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 259e204..6e0b4b6 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -243,7 +243,7 @@ class Puppet::Util::Settings
 
     # Make a directory with the appropriate user, group, and mode
     def mkdir(default)
-        obj = get_config_default(default)
+        obj = get_config_file_default(default)
 
         Puppet::Util::SUIDManager.asuser(obj.owner, obj.group) do
             mode = obj.mode || 0750
@@ -731,14 +731,14 @@ Generated on #{Time.now}.
 
     # Open a file with the appropriate user, group, and mode
     def write(default, *args, &bloc)
-        obj = get_config_default(default)
+        obj = get_config_file_default(default)
         writesub(default, value(obj.name), *args, &bloc)
     end
 
     # Open a non-default file under a default dir with the appropriate user,
     # group, and mode
     def writesub(default, file, *args, &bloc)
-        obj = get_config_default(default)
+        obj = get_config_file_default(default)
         chown = nil
         if Puppet::Util::SUIDManager.uid == 0
             chown = [obj.owner, obj.group]
@@ -764,7 +764,7 @@ Generated on #{Time.now}.
     end
 
     def readwritelock(default, *args, &bloc)
-        file = value(get_config_default(default).name)
+        file = value(get_config_file_default(default).name)
         tmpfile = file + ".tmp"
         sync = Sync.new
         unless FileTest.directory?(File.dirname(tmpfile))
@@ -795,7 +795,7 @@ Generated on #{Time.now}.
 
     private
 
-    def get_config_default(default)
+    def get_config_file_default(default)
         obj = nil
         unless obj = @config[default]
             raise ArgumentError, "Unknown default %s" % default

-- 
Puppet packaging for Debian