almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix broken single-item tuples in a few places

Browse Source 
When we stopped caring about ppc and ppc64, we changed several
instances of three-item tuples:

("ppc", "ppc64", "ppc64le")

into...this:

("ppc64le")

which is not a single item tuple, but just the string "ppc64le"
in some extraneous braces. It so happens that the right thing
still happened in all relevant cases , we think, but it's wrong.
There's no need to be using an iterator at all for a single
item, so just change them all to == "ppc64le" or != "ppc64le" as
appropriate.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-09-14 13:56:36 -07:00 committed by Brian C. Lane
parent 49190376ce
commit ea65f428dc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/templates.d/99-generic/live/live-install.tmpl
View File

@ -21,7 +21,7 @@
installpkg biosdevname memtest86+ syslinux installpkg biosdevname memtest86+ syslinux
installpkg grub2-tools grub2-tools-minimal grub2-tools-extra installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
%endif %endif
%if basearch in ("ppc64le"): %if basearch == "ppc64le":
installpkg powerpc-utils installpkg powerpc-utils
installpkg grub2-tools grub2-tools-minimal grub2-tools-extra installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
installpkg grub2-${basearch} installpkg grub2-${basearch}

2
share/templates.d/99-generic/runtime-cleanup.tmpl
View File

@ -283,7 +283,7 @@ removefrom ncurses /usr/bin/reset /usr/bin/tabs /usr/bin/tic /usr/bin/toe
removefrom ncurses /usr/bin/tput /usr/bin/tset removefrom ncurses /usr/bin/tput /usr/bin/tset
removefrom ncurses-libs /usr/${libdir}/libform* removefrom ncurses-libs /usr/${libdir}/libform*
## libmenu.so is needed by lp_diag binary from ppc64-diag which is a PowerPC specific package ## libmenu.so is needed by lp_diag binary from ppc64-diag which is a PowerPC specific package
%if basearch not in ("ppc64le"): %if basearch != "ppc64le":
removefrom ncurses-libs /usr/${libdir}/libmenu* removefrom ncurses-libs /usr/${libdir}/libmenu*
%endif %endif
removefrom ncurses-libs /usr/${libdir}/libpanel.* /usr/${libdir}/libtic* removefrom ncurses-libs /usr/${libdir}/libpanel.* /usr/${libdir}/libtic*

2
share/templates.d/99-generic/runtime-install.tmpl
View File

@ -55,7 +55,7 @@ installpkg glibc-all-langpacks
installpkg biosdevname memtest86+ syslinux installpkg biosdevname memtest86+ syslinux
installpkg grub2-tools grub2-tools-minimal grub2-tools-extra installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
%endif %endif
%if basearch in ("ppc64le"): %if basearch == "ppc64le":
installpkg powerpc-utils lsvpd ppc64-diag installpkg powerpc-utils lsvpd ppc64-diag
installpkg grub2-tools grub2-tools-minimal grub2-tools-extra installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
installpkg grub2-${basearch} installpkg grub2-${basearch}