summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-16 12:26:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-16 12:26:04 +0000
commit42fe7ceb501b9eef9e7f8349fc23a6c58941b714 (patch)
tree3186c316e275c0bf254c16edf5b5669742099fc1 /common.mk
parentec3a906bb63581adb3d1dab95fac645c9c8a053d (diff)
Old gem file had not been removed
* common.mk (update-gems): `old.delete("gems/#{gem}")` always returns nil because when really downloading new gem, the filename is not in `old`. the real intention of this condition might be checking `old` is empty or not. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index a037328d59..6e231258c4 100644
--- a/common.mk
+++ b/common.mk
@@ -1134,7 +1134,7 @@ update-gems: PHONY
-e 'old = Dir.glob("gems/#{gem}-*.gem")' \
-e 'gem = "#{gem}-#{ver}.gem"' \
-e 'Downloader::RubyGems.download(gem, "gems", nil) and' \
- -e 'old.delete("gems/#{gem}") and' \
+ -e '(old.delete("gems/#{gem}"); !old.empty?) and' \
-e 'File.unlink(*old) and' \
-e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})' \
gems/bundled_gems