Commit 35c536a0 authored by Ed Reel's avatar Ed Reel Committed by GitHub

Merge pull request #5385 from supechicken666/crew_fix

crew: Abort when install if package not compatible
parents 9d90045b efb1b24e
...@@ -214,9 +214,8 @@ def generate_compatible ...@@ -214,9 +214,8 @@ def generate_compatible
end end
def search (pkgName, silent = false) def search (pkgName, silent = false)
Find.find (CREW_LIB_PATH + 'packages') do |filename| pkgPath = CREW_LIB_PATH + 'packages/' + pkgName + '.rb'
return set_package(pkgName, filename) if filename == CREW_LIB_PATH + 'packages/' + pkgName + '.rb' return set_package(pkgName, pkgPath) if File.exist?(pkgPath)
end
abort "Package #{pkgName} not found. :(".lightred unless silent abort "Package #{pkgName} not found. :(".lightred unless silent
end end
...@@ -740,6 +739,7 @@ def expand_dependencies ...@@ -740,6 +739,7 @@ def expand_dependencies
end end
def resolve_dependencies def resolve_dependencies
abort "Package #{@pkg.name} is not compatible with your device architecture (#{ARCH}) :/".lightred unless @pkg.compatibility.include?('all') or @pkg.compatibility.include?(ARCH)
@pkg.preflight @pkg.preflight
expand_dependencies expand_dependencies
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.7.11' CREW_VERSION = '1.7.12'
ARCH_ACTUAL = `uname -m`.strip ARCH_ACTUAL = `uname -m`.strip
# This helps with virtualized builds on aarch64 machines # This helps with virtualized builds on aarch64 machines
......
require 'package_helpers' require 'package_helpers'
class Package class Package
property :description, :homepage, :version, :compatibility, :binary_url, :binary_sha1, :binary_sha256, :source_url, :source_sha1, :source_sha256, :is_fake property :description, :homepage, :version, :compatibility, :binary_url, :binary_sha256, :source_url, :source_sha256, :is_fake
class << self class << self
attr_reader :is_fake attr_reader :is_fake
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment