Attachment 294440 Details for Bug 432142 – Fix 0.24.1 "already managed" bug

[patch] Fix 0.24.1 "already managed" bug

puppet-0.24.1-double-manage.diff (text/plain), 1.82 KB, created by Frank Sweetser on 2008-02-09 01:33:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Sweetser

Created: 2008-02-09 01:33:28 UTC

Size: 1.82 KB

patch

obsolete

>commit 8a649ff28a46afe6b1e4dd002ac90c93651edfa3
>Author: Luke Kanies <luke@madstop.com>
>Date:   Sun Jan 20 21:21:37 2008 -0800
>
>    I think I've finally fixed #959, by having the Settings
>    class skip any resources that are already in memory.
>
>diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
>index b672d95..ff019ed 100644
>--- a/lib/puppet/util/settings.rb
>+++ b/lib/puppet/util/settings.rb
>@@ -510,18 +510,19 @@ class Puppet::Util::Settings
>             end
> 
>             # Only files are convertable to transportable resources.
>-            if obj.respond_to? :to_transportable
>-                next if value(obj.name) =~ /^\/dev/
>-                transobjects = obj.to_transportable
>-                transobjects = [transobjects] unless transobjects.is_a? Array
>-                transobjects.each do |trans|
>-                    # transportable could return nil
>-                    next unless trans
>-                    unless done[:file].include? trans.name
>-                        @created << trans.name
>-                        objects << trans
>-                        done[:file][trans.name] = trans
>-                    end
>+            next unless obj.respond_to? :to_transportable
>+            next if value(obj.name) =~ /^\/dev/
>+            next if Puppet::Type::File[obj.value] # skip files that are in our global resource list.
>+
>+            transobjects = obj.to_transportable
>+            transobjects = [transobjects] unless transobjects.is_a? Array
>+            transobjects.each do |trans|
>+                # transportable could return nil
>+                next unless trans
>+                unless done[:file].include? trans.name
>+                    @created << trans.name
>+                    objects << trans
>+                    done[:file][trans.name] = trans
>                 end
>             end
>         end

Actions: View | Diff

Attachments on bug 432142: 294440