Skip to content

Commit 127bbdf

Browse files
committed
macOS: update qt5/6 logic parsing booleans
In 2.20, parsing input strings as booleans is no longer standard behavior. Update the macports and homebrew playbooks to convert any passed in qt5/6 flags to booleans.
1 parent 4b5a9b3 commit 127bbdf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

roles/mythtv/tasks/homebrew_macosx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- name: homebrew_macosx | Set qt6 to true
2222
set_fact:
2323
qt6: true
24-
when: qt5 is undefined
24+
when: not qt5 | default(false) | bool
2525

2626
- name: homebrew_macosx | Set cpanm_active to true
2727
set_fact:

roles/mythtv/tasks/macports_macosx.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
- name: macports_macosx | Set qt6 to true
1919
set_fact:
2020
qt6: true
21-
when: qt5 is undefined
21+
when: not qt5 | default(false) | bool
2222

2323
- name: macports_macosx | Set venv_active to true
2424
set_fact:
@@ -62,12 +62,12 @@
6262
- name: macports_macosx | Set qt_version as qt5
6363
set_fact:
6464
qt_version: qt5
65-
when: qt5 is defined and qt5
65+
when: qt5 | default(false) | bool
6666

6767
- name: macports_macosx | Set qt_version as qt6
6868
set_fact:
6969
qt_version: qt6
70-
when: qt5 is undefined or not qt5
70+
when: qt5 | default(true) | bool
7171

7272
# get the python version specified by user in ansible_python_interpreter or defaulted by the interpreter
7373
- name: macports_macosx | Gather specific Python facts

0 commit comments

Comments
 (0)