summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-06-29 13:35:44 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-01 13:48:05 -0700
commit223157d6ac586b9ec9d2dc48ee4247daf0686d8f (patch)
treef1fd0548e0fd3227e92bf5c4c6eaf8c7a6aaa015
parent174e02a2b71fd51ff27f9186526352d79253da26 (diff)
downloadpuppet-223157d6ac586b9ec9d2dc48ee4247daf0686d8f.tar.gz
puppet-223157d6ac586b9ec9d2dc48ee4247daf0686d8f.tar.xz
puppet-223157d6ac586b9ec9d2dc48ee4247daf0686d8f.zip
Fix for #4091 -- require loop in executables
The describe and resource (ralsh) applications required puppet, creating a loop & thus crashing them.
-rw-r--r--lib/puppet/application/describe.rb1
-rw-r--r--lib/puppet/application/resource.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/puppet/application/describe.rb b/lib/puppet/application/describe.rb
index ae33fb92a..4da64b3bb 100644
--- a/lib/puppet/application/describe.rb
+++ b/lib/puppet/application/describe.rb
@@ -1,4 +1,3 @@
-require 'puppet'
require 'puppet/application'
class Formatter
diff --git a/lib/puppet/application/resource.rb b/lib/puppet/application/resource.rb
index 6a8c4e47c..ae80307ea 100644
--- a/lib/puppet/application/resource.rb
+++ b/lib/puppet/application/resource.rb
@@ -1,4 +1,3 @@
-require 'puppet'
require 'puppet/application'
require 'facter'