-
Notifications
You must be signed in to change notification settings - Fork 676
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove Support for OVAL 5.10 #9604
Changes from 7 commits
9f4d405
3b0d0b6
051ed18
cf72228
4f5ddc7
d95b1bf
b58a742
b165f2d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ | |
# ARG_USE_ENV([ADDITIONAL_CMAKE_OPTIONS],[],[Whitespace-separated string of arguments to pass to CMake]) | ||
# ARG_POSITIONAL_INF([product],[Products to build, ALL means all products],[0],[ALL]) | ||
# ARG_DEFAULTS_POS([]) | ||
# ARG_TYPE_GROUP_SET([oval_ver],[VERSION],[oval],[5.10,5.11,auto]) | ||
# ARG_TYPE_GROUP_SET([oval_ver],[VERSION],[oval],[5.11,auto]) | ||
# ARG_TYPE_GROUP_SET([builder_type],[BUILDER],[builder],[make,ninja,auto]) | ||
# ARG_HELP([Wipes out contents of the 'build' directory and builds only and only the given products.]) | ||
# ARGBASH_GO() | ||
|
@@ -38,12 +38,12 @@ die() | |
|
||
oval_ver() | ||
{ | ||
local _allowed=("5.10" "5.11" "auto") _seeking="$1" | ||
local _allowed=("5.11" "auto") _seeking="$1" | ||
for element in "${_allowed[@]}" | ||
do | ||
test "$element" = "$_seeking" && echo "$element" && return 0 | ||
done | ||
die "Value '$_seeking' (of argument '$2') doesn't match the list of allowed values: '5.10', '5.11' and 'auto'" 4 | ||
die "Value '$_seeking' (of argument '$2') doesn't match the list of allowed values: '5.11' and 'auto'" 4 | ||
} | ||
|
||
|
||
|
@@ -85,7 +85,7 @@ print_help() | |
printf '%s\n' "Wipes out contents of the 'build' directory and builds only and only the given products." | ||
printf 'Usage: %s [-o|--oval <VERSION>] [-b|--builder <BUILDER>] [-j|--jobs <arg>] [--(no-)debug] [--(no-)derivatives] [--(no-)ansible-playbooks] [--(no-)bash-scripts] [-d|--(no-)datastream-only] [-p|--(no-)profiling] [-h|--help] [<product-1>] ... [<product-n>] ...\n' "$0" | ||
printf '\t%s\n' "<product>: Products to build, ALL means all products (defaults for <product>: 'ALL')" | ||
printf '\t%s\n' "-o, --oval: OVAL version. Can be one of: '5.10', '5.11' and 'auto' (default: 'auto')" | ||
printf '\t%s\n' "-o, --oval: OVAL version. Can be one of: '5.11' or 'auto' (default: 'auto')" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does it make sense to keep the option here when it basically has no effect? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Main reason I kept was for backword compability you still set 5.11 if you want to. If we don't see this as a valid reason and don't see OVAL 5.12 coming out, we may want to remove this. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok |
||
printf '\t%s\n' "-b, --builder: Builder engine. Can be one of: 'make', 'ninja' and 'auto' (default: 'auto')" | ||
printf '\t%s\n' "-j, --jobs: Count of simultaneous jobs (default: 'auto')" | ||
printf '\t%s\n' "--debug, --no-debug: Make a debug build with draft profiles (off by default)" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can go even further and remove this check, because the
"OVAL Version: 5.11"
has been introduced in OpenSCAP 1.2.2 so the error happens on RHEL 7.1 and older and I don't think anybody uses these old systems for content development.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems reasonable to me. Some basic research shows that OpenSCAP 1.2.2+ is in Fedora, RHEL, Ubuntu, Debian, and OpenSUSE.