Commit 9cd537c6 authored by Ed Reel's avatar Ed Reel Committed by GitHub

Fix crew list available and crew list compatible (#5823)

parent 0bb67f78
...@@ -192,8 +192,6 @@ def list_available ...@@ -192,8 +192,6 @@ def list_available
end end
if @pkg.compatibility&.include? 'all' or @pkg.compatibility&.include? ARCH if @pkg.compatibility&.include? 'all' or @pkg.compatibility&.include? ARCH
puts pkgName puts pkgName
else
puts pkgName.lightred
end end
end end
end end
...@@ -222,17 +220,18 @@ def list_installed ...@@ -222,17 +220,18 @@ def list_installed
end end
def list_compatible(compat = true) def list_compatible(compat = true)
generate_compatible
Dir[CREW_PACKAGES_PATH + '*.rb'].each do |filename| Dir[CREW_PACKAGES_PATH + '*.rb'].each do |filename|
pkgName = File.basename filename, '.rb' pkgName = File.basename filename, '.rb'
if @device[:compatible_packages].any? do |elem| elem[:name] == pkgName end if @device[:compatible_packages].any? do |elem| elem[:name] == pkgName end
if ( File.exist? CREW_META_PATH + pkgName + '.filelist' ) && compat if compat
puts pkgName.lightgreen if ( File.exist? CREW_META_PATH + pkgName + '.filelist' )
else puts pkgName.lightgreen
puts pkgName if compat else
puts pkgName
end
end end
else else
puts pkgName.lightred puts pkgName.lightred unless compat
end end
end end
end end
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.10.7' CREW_VERSION = '1.10.8'
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
......
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