admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

bottle: do not follow symlink when setting mtime

Browse Source 
Also set atime to mtime, which seems to be a more common practice.

Fixes Homebrew/homebrew#49007

Closes Homebrew/homebrew#49027.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2016-02-10 19:29:40 +08:00
parent 2facb5166c
commit e5b6f79b22
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cmd/bottle.rb
View File

@ -209,11 +209,20 @@ module Homebrew
tab.time = nil
tab.write
keg.find {|k| File.utime(File.atime(k), tab.source_modified_time, k) }
keg.find do |file|
if file.symlink?
# Ruby does not support `File.lutime` yet.
# Shellout using `touch` to change modified time of symlink itself.
system "/usr/bin/touch", "-h",
"-t", tab.source_modified_time.strftime("%Y%m%d%H%M.%S"), file
else
file.utime(tab.source_modified_time, tab.source_modified_time)
end
end
cd cellar do
safe_system "tar", "cf", tar_path, "#{f.name}/#{f.pkg_version}"
File.utime(File.atime(tar_path), tab.source_modified_time, tar_path)
tar_path.utime(tab.source_modified_time, tab.source_modified_time)
relocatable_tar_path = "#{f}-bottle.tar"
mv tar_path, relocatable_tar_path
# Use gzip, faster to compress than bzip2, faster to uncompress than bzip2

5
Library/Homebrew/test/test_integration_cmds.rb
View File

@ -152,6 +152,11 @@ class IntegrationCommandTests < Homebrew::TestCase
url "https://example.com/testball-0.1.tar.gz"
end
EOS
# `brew bottle` should not fail with dead symlink
# https://github.com/Homebrew/homebrew/issues/49007
(HOMEBREW_CELLAR/"testball/0.1").cd do
FileUtils.ln_s "not-exist", "symlink"
end
assert_match(/testball-0\.1.*\.bottle\.tar\.gz/,
cmd_output("bottle", "--no-revision", "testball"))
ensure