Skip to content

Commit 43b1cf2

Browse files
author
Bill Meek
committed
Single Role: replace flatten with lookup(flattened
In stable-2.19, flatten keeps the list markings [] Various comment and typo changes. In the *ignore files, change ignore more combinations of .swp files (**.sw[nop]). And switch remote_hosts.yml to just rhosts.yml.
1 parent fd832e1 commit 43b1cf2

File tree

8 files changed

+11
-12
lines changed

8 files changed

+11
-12
lines changed

.dockerignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
.yamllint.yml
77
*.sh
88
*.setup.out
9-
**.swo
10-
**.swp
9+
**.sw[nop]
1110
*~
1211
**/Docker
1312
Dockerfile
1413
README.md
15-
remote_hosts.yml
14+
rhosts.yml
1615
tags

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ Dockerfile
44
Docker
55
group_vars/user_options.yml
66
tags
7-
remote_hosts.yml
7+
rhosts.yml
88
*~
99
*.setup.out
1010
*.sh
11-
**.swo
12-
**.swp
11+
**.sw[nop]
1312
# If retry_files_enabled=False gets changed in ansible.cfg
1413
mythtv.retry
1514
qt5.retry

hosts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mythtv_hosts:
2020
ansible_python_interpreter: /usr/libexec/platform-python
2121
f30:
2222
ansible_python_interpreter: /usr/bin/python3
23-
freebsd:
23+
freebsd: # If sudo isn't installed on the host
2424
ansible_become_method: su
2525
use_old_roles: false
2626
macosx:

roles/common/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# prevent users from running ALL hosts. The instructions are clear that
33
# the --limit=<name> must be used. The debug: prints information useful
44
# for diagnosing issues.
5+
#
6+
# Next, print some valuable debugging information
7+
#
8+
# Finally, load any user specific variables (not under git control).
59

610
---
711

roles/mythtv-deb/tasks/debian.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
block:
176176
- set_fact:
177177
deb_pkg_lst: '{{ lookup("flattened", deb_pkg_lst) }}'
178-
# deb_pkg_lst: '{{ deb_pkg_lst | flatten() }}'
179178

180179
- set_fact:
181180
deb_pkg_lst: "{{ deb_pkg_lst | replace('python3-oauth', 'python3-oauthlib') }}"

roles/mythtv-pacman/tasks/yay.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
- name: yay | '{{ manual_action_text }}'
7676
debug:
7777
msg: 'yay -S {{ lookup("flattened", aur_packages) | regex_replace(",", " ") }}'
78-
# msg: 'yay -S {{ list_o_strings | flatten() | regex_replace(",", " ") }}'
7978

8079
...
8180

roles/mythtv/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262

6363
- name: Flatten package lists
6464
set_fact:
65-
packages: '{{ packages | flatten() | sort }}'
65+
packages: '{{ lookup("flattened", packages) }}'
6666

6767
- name: Final package list
6868
debug:
69-
msg: '{{ packages }}'
69+
var: packages
7070

7171
- name: Install the packages
7272
package:

roles/mythtv/tasks/pacman_archlinux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
- name: pacman_archlinux | '{{ manual_action_text }}'
7676
debug:
7777
msg: 'yay -S {{ lookup("flattened", aur_packages) | regex_replace(",", " ") }}'
78-
# msg: 'yay -S {{ list_o_strings | flatten() | regex_replace(",", " ") }}'
7978

8079
...
8180

0 commit comments

Comments
 (0)