Revert "lib/const: Simplify + cleanup (#8890)" (#8895)

This reverts commit f3a58c9492.

Fixes `crew install vim` and `crew install cantarell_fonts`.
This commit is contained in:
Ed Reel
2023-11-05 16:49:42 -06:00
committed by GitHub
parent f3fe51b470
commit 21f11675dd
6 changed files with 130 additions and 83 deletions

View File

@@ -753,7 +753,7 @@ def upgrade(*pkgs, build_from_source: false)
to_be_upgraded.each do |pkgName|
search(pkgName)
print_current_package
@pkg.build_from_source = (build_from_source || CREW_BUILD_FROM_SOURCE)
@pkg.build_from_source = (build_from_source or CREW_BUILD_FROM_SOURCE.eql?(1))
puts "Updating #{@pkg.name}..." if @opt_verbose
@@ -1886,7 +1886,7 @@ def install_command(args)
@pkgName = name
search @pkgName
print_current_package true
@pkg.build_from_source = true if @opt_source || @opt_recursive || CREW_BUILD_FROM_SOURCE
@pkg.build_from_source = true if @opt_source || @opt_recursive || (CREW_BUILD_FROM_SOURCE == '1')
resolve_dependencies_and_install
end
end
@@ -1924,7 +1924,7 @@ def reinstall_command(args)
@pkgName = name
search @pkgName
print_current_package
@pkg.build_from_source = true if @opt_source || @opt_recursive || CREW_BUILD_FROM_SOURCE
@pkg.build_from_source = true if @opt_source || @opt_recursive || (CREW_BUILD_FROM_SOURCE == '1')
next unless @pkgName
@pkg.in_upgrade = true