Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
brew
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KMSCAKKSCFKA AKFACAMADCAS
brew
Commits
c7c33c98
Commit
c7c33c98
authored
12 years ago
by
Mike McQuaid
Browse files
Options
Downloads
Patches
Plain Diff
Warn on bottles skipped due to non-default Cellar.
Closes Homebrew/homebrew#18333.
parent
5a2874c6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Library/Homebrew/bottles.rb
+5
-2
5 additions, 2 deletions
Library/Homebrew/bottles.rb
Library/Homebrew/formula_installer.rb
+1
-1
1 addition, 1 deletion
Library/Homebrew/formula_installer.rb
with
6 additions
and
3 deletions
Library/Homebrew/bottles.rb
+
5
−
2
View file @
c7c33c98
...
...
@@ -9,7 +9,7 @@ def bottle_filename f, bottle_revision=nil
"
#{
name
}
-
#{
version
}#{
bottle_native_suffix
(
bottle_revision
)
}
"
end
def
install_bottle?
f
def
install_bottle?
f
,
warn
=
false
return
true
if
f
.
downloader
and
defined?
f
.
downloader
.
local_bottle_path
\
and
f
.
downloader
.
local_bottle_path
...
...
@@ -17,7 +17,10 @@ def install_bottle? f
return
false
unless
f
.
pour_bottle?
return
false
unless
f
.
build
.
used_options
.
empty?
return
false
unless
bottle_current?
(
f
)
return
false
if
f
.
bottle
.
cellar
!=
:any
&&
f
.
bottle
.
cellar
!=
HOMEBREW_CELLAR
.
to_s
if
f
.
bottle
.
cellar
!=
:any
&&
f
.
bottle
.
cellar
!=
HOMEBREW_CELLAR
.
to_s
opoo
"Building source; cellar of
#{
f
}
's bottle is
#{
f
.
bottle
.
cellar
}
"
if
warn
return
false
end
true
end
...
...
This diff is collapsed.
Click to expand it.
Library/Homebrew/formula_installer.rb
+
1
−
1
View file @
c7c33c98
...
...
@@ -25,7 +25,7 @@ class FormulaInstaller
end
def
pour_bottle?
install_bottle?
(
f
)
&&
(
tab
.
used_options
.
empty?
rescue
true
)
&&
options
.
empty?
(
tab
.
used_options
.
empty?
rescue
true
)
&&
options
.
empty?
&&
install_bottle?
(
f
,
true
)
end
def
check_install_sanity
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment