Skip to content
Snippets Groups Projects
Commit 4e651755 authored by Jack Nagel's avatar Jack Nagel Committed by Adam Vandenberg
Browse files

Fix misspelled method name: Formula.canonical_name

parent 98f51446
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ module Homebrew extend self
end
if Formula.aliases.include? fc.name
realname = Formula.caniconical_name fc.name
realname = Formula.canonical_name fc.name
raise <<-EOS.undent
The formula #{realname} is already aliased to #{fc.name}
Please check that you are not creating a duplicate.
......
......@@ -13,7 +13,7 @@ module Homebrew extend self
else
# Don't use ARGV.formulae as that will throw if the file doesn't parse
paths = ARGV.named.map do |name|
HOMEBREW_REPOSITORY+"Library/Formula/#{Formula.caniconical_name name}.rb"
HOMEBREW_REPOSITORY+"Library/Formula/#{Formula.canonical_name name}.rb"
end
unless ARGV.force?
paths.each do |path|
......
......@@ -18,7 +18,7 @@ module HomebrewArgvExtension
require 'keg'
require 'formula'
@kegs ||= downcased_unique_named.collect do |name|
d = HOMEBREW_CELLAR+Formula.caniconical_name(name)
d = HOMEBREW_CELLAR+Formula.canonical_name(name)
dirs = d.children.select{ |pn| pn.directory? } rescue []
raise NoSuchKegError.new(name) if not d.directory? or dirs.length == 0
raise MultipleVersionsInstalledError.new(name) if dirs.length > 1
......
......@@ -348,7 +348,7 @@ class Formula
Dir["#{HOMEBREW_REPOSITORY}/Library/Aliases/*"].map{ |f| File.basename f }.sort
end
def self.caniconical_name name
def self.canonical_name name
formula_with_that_name = HOMEBREW_REPOSITORY+"Library/Formula/#{name}.rb"
possible_alias = HOMEBREW_REPOSITORY+"Library/Aliases"+name
if name.include? "/"
......@@ -390,7 +390,7 @@ class Formula
install_type = :from_path
target_file = path.to_s
else
name = Formula.caniconical_name(name)
name = Formula.canonical_name(name)
# For names, map to the path and then require
require Formula.path(name)
install_type = :from_name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment