`brew create` uses new Aliasing system

1 files changed, 8 insertions, 6 deletions

diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index bc0f59467..0040e83ef 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -36,12 +36,14 @@ def __make url, name
 
   path = Formula.path name
   raise "#{path} already exists" if path.exist?
-  
-  # Check if a formula aliased to this name exists.
-  already_aka = Formulary.find_alias name
-  if already_aka != nil
-    opoo "Formula #{already_aka} is aliased to #{name}."
-    puts "Please check if you are creating a duplicate."
+
+  if Formula.aliases.include? name and not ARGV.force?
+    realname = HOMEBREW_REPOSITORY.join("Library/Aliases/#{name}").realpath.basename('.rb')
+    raise <<-EOS.undent
+          The formula #{realname} is already aliased to #{name}
+          Please check that you are not creating a duplicate.
+          To force creation use --force.
+          EOS
   end
 
   version = Pathname.new(url).version