Merge branch '0.24.x' of git://github.com/lak/puppet into 0.24.x

Conflicts:

	CHANGELOG

2 files changed, 4 insertions, 38 deletions

diff --git a/lib/puppet/util/storage.rb b/lib/puppet/util/storage.rb
index 9358a28e9..dc4e9cd71 100644
--- a/lib/puppet/util/storage.rb
+++ b/lib/puppet/util/storage.rb
@@ -6,6 +6,10 @@ class Puppet::Util::Storage
     include Singleton
     include Puppet::Util
 
+    def self.state
+        return @@state
+    end
+
     def initialize
         self.class.load
     end
diff --git a/lib/puppet/util/variables.rb b/lib/puppet/util/variables.rb
deleted file mode 100644
index 1a78ef5c1..000000000
--- a/lib/puppet/util/variables.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-module Puppet::Util::Variables
-    def inithooks
-        @instance_init_hooks.dup
-    end
-
-    def initvars
-        return unless defined? @class_init_hooks
-        self.inithooks.each do |var, value|
-            if value.is_a?(Class)
-                instance_variable_set("@" + var.to_s, value.new)
-            else
-                instance_variable_set("@" + var.to_s, value)
-            end
-        end
-    end
-
-    def instancevar(hash)
-        @instance_init_hooks ||= {}
-
-        unless method_defined?(:initvars)
-            define_method(:initvars) do
-                self.class.inithooks.each do |var, value|
-                    if value.is_a?(Class)
-                        instance_variable_set("@" + var.to_s, value.new)
-                    else
-                        instance_variable_set("@" + var.to_s, value)
-                    end
-                end
-            end
-        end
-        hash.each do |var, value|
-            raise("Already initializing %s" % var) if @instance_init_hooks[var]
-
-            @instance_init_hooks[var] = value
-        end
-    end
-end
-