From 17f5631c6ea118b9ce0e8776dc50c7b1dcdaf596 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 18 Jan 2023 20:36:31 +0900
Subject: [Bug #19340] Fix bundle gems with test revision

Build temporary gem package from cloned repository if test revision is
set.
---
 common.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index abd652fe44..5f8d7e3e88 100644
--- a/common.mk
+++ b/common.mk
@@ -1402,10 +1402,10 @@ extract-gems$(gnumake:yes=-sequential): PHONY
 	    -e 'gem, ver, _, rev = *$$F' \
 	    -e 'next if !ver or /^#/=~gem' \
 	    -e 'g = "#{gem}-#{ver}"' \
-	    -e 'if File.directory?("#{d}/#{g}")' \
-	    -e 'elsif rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \
-	    -e   'BundledGem.copy(gs, ".bundle")' \
-	    -e 'else' \
+	    -e 'unless File.directory?("#{d}/#{g}")' \
+	    -e   'if rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \
+	    -e     'BundledGem.build(gs, ver, "gems")' \
+	    -e   'end' \
 	    -e   'BundledGem.unpack("gems/#{g}.gem", ".bundle")' \
 	    -e 'end' \
 	    gems/bundled_gems
-- 
cgit v1.2.1