Skip to content

Fix val2bool not working with str objects #14

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.

Sign up for GitHub

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

Open
velezd wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix val2bool not working with str objects #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6ad58f
Fix val2bool not working with str objects
velezd Jul 18, 2021
7d59568
Fix spec template for RHEL-9
velezd Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/ddiskit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ def val2bool(val):
return val
if isinstance(val, (int, long)):
return val != 0
if isinstance(val, u"".__class__):
if isinstance(val, u"".__class__) or isinstance(val, str):
val = val.lower()

if val in ("t", "y", "true", "yes", "1"):
Expand Down
4 changes: 3 additions & 1 deletion templates/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
%endif

%if "%{kmod_dist_build_deps}" == ""
%if (0%{?rhel} > 7) || (0%{?centos} > 7)
%if (0%{?rhel} > 8) || (0%{?centos} > 8)
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-stablelists elfutils-libelf-devel kernel-rpm-macros kmod
%elif (0%{?rhel} > 7) || (0%{?centos} > 7)
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists elfutils-libelf-devel kernel-rpm-macros kmod
%else
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists
Expand Down