summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-02-17 15:36:26 -0800
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitc5a4de28532eaaf8abf2496ca1d4cdc02e5f450a (patch)
treec07656bb35515c3ba9c91d2657c2f3cd6046a119
parentc694c4d34fea8b45695222321930e64b8991887a (diff)
downloadpuppet-c5a4de28532eaaf8abf2496ca1d4cdc02e5f450a.tar.gz
puppet-c5a4de28532eaaf8abf2496ca1d4cdc02e5f450a.tar.xz
puppet-c5a4de28532eaaf8abf2496ca1d4cdc02e5f450a.zip
Fixing #3185 Rakefile is loading puppet.rb twice
A 'require' statement with a path confused ruby enough to cause the same file to get interpreted twice. Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
-rw-r--r--Rakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index 193ba77d3..7b6983a04 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@
$: << File.expand_path('lib')
$LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
-require './lib/puppet.rb'
+require 'puppet.rb'
require 'rake'
require 'rake/packagetask'
require 'rake/gempackagetask'