From a61ae414b6f8310c9dff9a6f18b6064499167513 Mon Sep 17 00:00:00 2001
From: NAKAMURA Usaku <usa@ruby-lang.org>
Date: Wed, 2 Oct 2019 13:00:17 +0900
Subject: Fix the order of executing `after-update` task

---
 tool/make-snapshot | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'tool')

diff --git a/tool/make-snapshot b/tool/make-snapshot
index 95d5befea3..6efd827187 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -437,8 +437,8 @@ def package(vcs, rev, destdir, tmp = nil)
       mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "").sub(/^revision\.tmp::$/, '\& Makefile')
       mk << <<-'APPEND'
 
-update-download:: touch-unicode-files after-update
-prepare-package: prereq
+update-download:: touch-unicode-files
+prepare-package: prereq after-update
 clean-cache: $(CLEAN_CACHE)
 after-update:: extract-gems
 extract-gems: update-gems
@@ -473,7 +473,11 @@ touch-unicode-files:
         end
         modified = new_time
       end
-      unless system(make, "prepare-package", "clean-cache", *args)
+      unless system(make, "prepare-package", *args)
+        puts $colorize.fail("prepare-package failed")
+        return
+      end
+      unless system(make, "clean-cache", *args)
         puts $colorize.fail("prepare-package failed")
         return
       end
-- 
cgit v1.2.3