aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMarkus Reiter2016-09-21 13:43:02 +0200
committerMarkus Reiter2016-09-23 15:30:06 +0200
commitd7a312f6cf1a17e36891f4533ec48e53c5276e3d (patch)
treebc3f07ad10a0ce8fe6bfa0d2dec8048b841f47e3 /Library
parentce6994b001520b8e5d26e5e15b410c9146072104 (diff)
downloadbrew-d7a312f6cf1a17e36891f4533ec48e53c5276e3d.tar.bz2
Fix Style/IdenticalConditionalBranches.
Diffstat (limited to 'Library')
-rw-r--r--Library/.rubocop_todo.yml5
-rw-r--r--Library/Homebrew/formula_lock.rb5
2 files changed, 2 insertions, 8 deletions
diff --git a/Library/.rubocop_todo.yml b/Library/.rubocop_todo.yml
index 7bbad3c87..04a2cdd6e 100644
--- a/Library/.rubocop_todo.yml
+++ b/Library/.rubocop_todo.yml
@@ -188,11 +188,6 @@ Style/GuardClause:
- 'Homebrew/utils/popen.rb'
- 'Homebrew/version.rb'
-# Offense count: 2
-Style/IdenticalConditionalBranches:
- Exclude:
- - 'Homebrew/formula_lock.rb'
-
# Offense count: 52
# Cop supports --auto-correct.
# Configuration parameters: MaxLineLength.
diff --git a/Library/Homebrew/formula_lock.rb b/Library/Homebrew/formula_lock.rb
index 1ce62b328..8743eaef8 100644
--- a/Library/Homebrew/formula_lock.rb
+++ b/Library/Homebrew/formula_lock.rb
@@ -35,9 +35,8 @@ class FormulaLock
if @lockfile.nil? || @lockfile.closed?
@lockfile = @path.open(File::RDWR | File::CREAT)
@lockfile.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
- @lockfile
- else
- @lockfile
end
+
+ @lockfile
end
end