Merge 68549674-multi-task to master

nebhale · nebhale · commit 9bb2d7904059 · 2014-03-31T16:01:57.000+01:00
[Completes #68549674]
diff --git a/rakelib/dependency_cache_task.rb b/rakelib/dependency_cache_task.rb
@@ -39,7 +39,7 @@ def initialize
         @cache                   = cache
 
         configurations = component_ids.map { |component_id| configurations(configuration(component_id)) }.flatten
-        uris(configurations).each { |uri| task PACKAGE_NAME => [cache_task(uri)] }
+        uris(configurations).each { |uri| multitask PACKAGE_NAME => [cache_task(uri)] }
       end
     end
 
diff --git a/rakelib/package_task.rb b/rakelib/package_task.rb
@@ -34,7 +34,7 @@ def initialize
       desc 'Create packaged buildpack'
       task package: [PACKAGE_NAME]
 
-      task PACKAGE_NAME => [BUILD_DIR, STAGING_DIR] do |t|
+      multitask PACKAGE_NAME => [BUILD_DIR, STAGING_DIR] do |t|
         rake_output_message "Creating #{t.name}"
 
         Zip::File.open(t.name, Zip::File::CREATE) do |zipfile|
diff --git a/rakelib/stage_buildpack_task.rb b/rakelib/stage_buildpack_task.rb
@@ -24,8 +24,8 @@ class StageBuildpackTask < Rake::TaskLib
     include Package
 
     def initialize(source_files)
-      source_files.map { |source| task PACKAGE_NAME => [copy_task(source, target(source))] }
-      task PACKAGE_NAME => [version_task]
+      source_files.map { |source| multitask PACKAGE_NAME => [copy_task(source, target(source))] }
+      multitask PACKAGE_NAME => [version_task]
       disable_remote_downloads_task if OFFLINE
     end
 
