admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "Raise an exception when double loading a formula"

Browse Source
This commit is contained in:
Mike McQuaid 2017-08-12 15:00:36 +01:00 committed by GitHub
parent b93f1e3569
commit ae8235c555
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/formulary.rb
View File

@ -20,8 +20,6 @@ module Formulary
raise "Formula loading disabled by HOMEBREW_DISABLE_LOAD_FORMULA!" raise "Formula loading disabled by HOMEBREW_DISABLE_LOAD_FORMULA!"
end end
raise "Formula #{name} has already been loaded" if const_defined?(namespace)
mod = Module.new mod = Module.new
const_set(namespace, mod) const_set(namespace, mod)
begin begin

10
Library/Homebrew/test/formulary_spec.rb
View File

@ -27,16 +27,6 @@ describe Formulary do
let(:bottle_dir) { Pathname.new("#{TEST_FIXTURE_DIR}/bottles") } let(:bottle_dir) { Pathname.new("#{TEST_FIXTURE_DIR}/bottles") }
let(:bottle) { bottle_dir/"testball_bottle-0.1.#{Utils::Bottles.tag}.bottle.tar.gz" } let(:bottle) { bottle_dir/"testball_bottle-0.1.#{Utils::Bottles.tag}.bottle.tar.gz" }
describe "::load_formula" do
it "does not allow namespace repetition" do |example|
definition = "Foo = Class.new(Formula)"
namespace = "Test#{example.description.hash.abs}"
subject.load_formula("foo", "bar", definition, namespace)
expect { subject.load_formula("foo", "bar", definition, namespace) }
.to raise_error RuntimeError, /already.* loaded/
end
end
describe "::class_s" do describe "::class_s" do
it "replaces '+' with 'x'" do it "replaces '+' with 'x'" do
expect(subject.class_s("foo++")).to eq("Fooxx") expect(subject.class_s("foo++")).to eq("Fooxx")