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

Pathname#abv: handle the case du returns empty string

Browse Source 
This can happen when read permission is denied.

Fixes Homebrew/homebrew#41925.

Closes Homebrew/homebrew#42011.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-07-22 19:47:02 +08:00
parent ebd0f34561
commit fd7f3b9496
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/pathname.rb
View File

@ -393,7 +393,9 @@ class Pathname
out = "" out = ""
n = Utils.popen_read("find", expand_path.to_s, "-type", "f", "!", "-name", ".DS_Store").split("\n").size n = Utils.popen_read("find", expand_path.to_s, "-type", "f", "!", "-name", ".DS_Store").split("\n").size
out << "#{n} files, " if n > 1 out << "#{n} files, " if n > 1
out << Utils.popen_read("/usr/bin/du", "-hs", expand_path.to_s).split("\t")[0].strip size = Utils.popen_read("/usr/bin/du", "-hs", expand_path.to_s).split("\t")[0]
size ||= "0B"
out << size.strip
out out
end end