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

Merge pull request #9277 from reitermarkus/app-source-not-there

Browse Source 
Add debug information for empty BOM error.
This commit is contained in:
Markus Reiter 2020-11-24 19:26:57 +01:00 committed by GitHub
commit 63dead36cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/unpack_strategy/dmg.rb
View File

@ -91,8 +91,10 @@ module UnpackStrategy
Tempfile.open(["", ".bom"]) do |bomfile| Tempfile.open(["", ".bom"]) do |bomfile|
bomfile.close bomfile.close
bom = path.bom
Tempfile.open(["", ".list"]) do |filelist| Tempfile.open(["", ".list"]) do |filelist|
filelist.puts(path.bom) filelist.puts(bom)
filelist.close filelist.close
system_command! "mkbom", system_command! "mkbom",
@ -100,9 +102,14 @@ module UnpackStrategy
verbose: verbose verbose: verbose
end end
system_command! "ditto", result = system_command! "ditto",
args: ["--bom", bomfile.path, "--", path, unpack_dir], args: ["--bom", bomfile.path, "--", path, unpack_dir],
verbose: verbose verbose: verbose
odebug "BOM contents:", bom
if result.stderr.include?("contains no files, nothing copied")
odebug "Directory contents:", Pathname.glob(path/"**/*", File::FNM_DOTMATCH).map(&:to_s).join("\n")
end
FileUtils.chmod "u+w", Pathname.glob(unpack_dir/"**/*", File::FNM_DOTMATCH).reject(&:symlink?) FileUtils.chmod "u+w", Pathname.glob(unpack_dir/"**/*", File::FNM_DOTMATCH).reject(&:symlink?)
end end