[Pkg-puppet-devel] [facter] 38/46: (packaging) Use the packaging loader for tasks

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 20293592682d32b414d3f409d0c9c0e2fe1f1610
Author: Moses Mendoza <moses at puppetlabs.com>
Date:   Mon Jun 24 14:27:12 2013 -0700

    (packaging) Use the packaging loader for tasks
    
    The packaging repo now uses an explicit loader which handles loading the
    various rake tasks in packaging. This commit updates the facter Rakefile to use
    the loader instead of a blind glob of the ext/packaging/tasks directory. We
    move this load into the rescue LoadError block because the packaging repo won't
    always be there, and require 'rake' ahead of time.
---
 Rakefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index aad745b..792af41 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,10 @@ require 'facter/version'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
+require 'rake'
+
 begin
+  load File.join(File.dirname(__FILE__), 'ext', 'packaging', 'packaging.rake')
   require 'rubygems'
   require 'rspec'
   require 'rspec/core/rake_task'
@@ -14,10 +17,7 @@ begin
 rescue LoadError
 end
 
-require 'rake'
-
 Dir['tasks/**/*.rake'].each { |t| load t }
-Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
 
 build_defs_file = 'ext/build_defaults.yaml'
 if File.exist?(build_defs_file)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git