[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:30:15 UTC 2010


The following commit has been merged in the upstream branch:
commit c5a4de28532eaaf8abf2496ca1d4cdc02e5f450a
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Wed Feb 17 15:36:26 2010 -0800

    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 at gmail.com>

diff --git a/Rakefile b/Rakefile
index 193ba77..7b6983a 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'

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list