File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -1169,7 +1169,8 @@ def formula_files_by_name
1169
1169
name , formula_hash = item
1170
1170
# If there's more than one item with the same path: use the longer one to prioritise more specific results.
1171
1171
existing_path = hash [ name ]
1172
- new_path = File . join ( tap_path , formula_hash [ "ruby_source_path" ] ) # Pathname equivalent is slow in a tight loop
1172
+ # Pathname equivalent is slow in a tight loop
1173
+ new_path = File . join ( tap_path , formula_hash . fetch ( "ruby_source_path" ) )
1173
1174
hash [ name ] = Pathname ( new_path ) if existing_path . nil? || existing_path . to_s . length < new_path . length
1174
1175
end
1175
1176
end
Original file line number Diff line number Diff line change @@ -158,8 +158,6 @@ class Wrong#{described_class.class_s(formula_name)} < Formula
158
158
159
159
context "with installed Formula" do
160
160
before do
161
- allow ( described_class ) . to receive ( :loader_for ) . and_call_original
162
-
163
161
# don't try to load/fetch gcc/glibc
164
162
allow ( DevelopmentTools ) . to receive_messages ( needs_libc_formula? : false , needs_compiler_formula? : false )
165
163
end
@@ -329,6 +327,7 @@ def formula_json_contents(extra_items = {})
329
327
"run_type" => "immediate" ,
330
328
"working_dir" => "/$HOME" ,
331
329
} ,
330
+ "ruby_source_path" => "Formula/#{ formula_name } .rb" ,
332
331
} . merge ( extra_items ) ,
333
332
}
334
333
end
@@ -378,7 +377,7 @@ def formula_json_contents(extra_items = {})
378
377
end
379
378
380
379
before do
381
- allow ( described_class ) . to receive ( :loader_for ) . and_return ( described_class :: FormulaAPILoader . new ( formula_name ) )
380
+ ENV . delete ( "HOMEBREW_NO_INSTALL_FROM_API" )
382
381
383
382
# don't try to load/fetch gcc/glibc
384
383
allow ( DevelopmentTools ) . to receive_messages ( needs_libc_formula? : false , needs_compiler_formula? : false )
You can’t perform that action at this time.
0 commit comments