aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Reiter2017-02-04 20:24:29 +0100
committerMarkus Reiter2017-02-04 20:27:59 +0100
commitfc712b0089dbb4e6ebeb3f5bc846b00a62029f69 (patch)
tree49bc76b2d8985b0b07ce8f037cbccb4fe5aac511
parent6d318761d21e43ef8785ae4da24b8f6fdbd52db8 (diff)
downloadbrew-fc712b0089dbb4e6ebeb3f5bc846b00a62029f69.tar.bz2
Make descriptions a bit clearer.
-rw-r--r--Library/Homebrew/cask/lib/hbc/pkg.rb4
-rw-r--r--Library/Homebrew/cask/test/cask/pkg_test.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/pkg.rb b/Library/Homebrew/cask/lib/hbc/pkg.rb
index 497a7b6dd..39252b48a 100644
--- a/Library/Homebrew/cask/lib/hbc/pkg.rb
+++ b/Library/Homebrew/cask/lib/hbc/pkg.rb
@@ -98,8 +98,8 @@ module Hbc
end
end
- # Some pkgs (microsoft office for one) leave files (generally nibs) but
- # report them as directories. We remove these as files instead.
+ # Some pkgs incorrectly report files (generally nibs)
+ # as directories; we remove these as files instead.
def _delete_broken_file_dir(path)
return unless path.file? && !path.symlink?
@command.run!("/bin/rm", args: ["-f", "--", path], sudo: true)
diff --git a/Library/Homebrew/cask/test/cask/pkg_test.rb b/Library/Homebrew/cask/test/cask/pkg_test.rb
index b99d49ddd..a52c90a0e 100644
--- a/Library/Homebrew/cask/test/cask/pkg_test.rb
+++ b/Library/Homebrew/cask/test/cask/pkg_test.rb
@@ -68,11 +68,11 @@ describe Hbc::Pkg do
fake_dir.must_be :exist?
end
- it "chokes on directories that are really files" do
+ it "cleans files incorrectly reported as directories" do
pkg = Hbc::Pkg.new("my.fake.pkg", Hbc::NeverSudoSystemCommand)
fake_dir = Pathname(Dir.mktmpdir)
- fake_file = fake_dir.join("ima_file").tap { |path| FileUtils.touch(path) }
+ fake_file = fake_dir.join("ima_file_pretending_to_be_a_dir").tap { |path| FileUtils.touch(path) }
pkg.stubs(:pkgutil_bom_specials).returns([])
pkg.stubs(:pkgutil_bom_files).returns([])