[Pkg-puppet-devel] [facter] 259/352: (maint) Load extra tasks before loading packaging

Stig Sandbeck Mathisen ssm at debian.org
Sun Apr 6 22:21:51 UTC 2014


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

ssm pushed a commit to branch master
in repository facter.

commit 86d4f610c2a0601cc3d7e36c2a2306bbdb9f6c6a
Author: Matthaus Owens <matthaus at puppetlabs.com>
Date:   Thu Feb 13 16:46:11 2014 -0800

    (maint) Load extra tasks before loading packaging
    
    Because the apple task now depends on the cfpropertylist task, the packaging
    will verify that such a task exists when loaded. This means that the extra
    facter tasks must be loaded before we load the packaging tools. This commit
    moves the facter task loading to before the packaging tool loading.
---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index acc0dfa..ed2ff2a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,7 @@ require 'facter/version'
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
 require 'rake'
+Dir['tasks/**/*.rake'].each { |t| load t }
 
 begin
   load File.join(File.dirname(__FILE__), 'ext', 'packaging', 'packaging.rake')
@@ -23,7 +24,6 @@ end
   end
 end
 
-Dir['tasks/**/*.rake'].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



More information about the Pkg-puppet-devel mailing list