[PATCH 0/3] "bash -n" fixes and nits
Lukas Schmelting <[email protected]>
| Newsgroups | gmane.linux.gentoo.devel |
|---|---|
| Message-ID | <[email protected]> |
I just ran bash -n on the v2 variant and saw bash -n wasn't completely
clean, apologies.
Lukas Schmelting (3):
metadata/install-qa-check.d: refactor 60udev-eclass
udev.eclass: add udev_hwdb_update function
metadata/install-qa-check.d: add udev hwdb check
eclass/udev.eclass | 16 +++
metadata/install-qa-check.d/60udev-eclass | 139 +++++++++++++++-------
2 files changed, 114 insertions(+), 41 deletions(-)
$ PAGER=cat git range-diff udev-hwdb-v2...udev-hwdb-v3
1: cfc1543234b6 ! 1: f301f364fbc7 metadata/install-qa-check.d: refactor 60udev-eclass
@@ metadata/install-qa-check.d/60udev-eclass: udev_rules_check() {
+ local need_udev_reload=0
+
+ # Check 2a: Check if udev rules must be updated
-+ if _dir_has_nonhidden_files "lib/udev/rules.d"
++ if _dir_has_nonhidden_files "lib/udev/rules.d" \
+ || _dir_has_nonhidden_files "usr/lib/udev/rules.d"; then
+ need_udev_reload=1
+ fi
2: 9759663666c7 ! 2: 28f6c11f5edb udev.eclass: add udev_hwdb_update function
@@ eclass/udev.eclass: udev_reload() {
+ if [[ -n ${ROOT} ]]; then
+ return 0
+ fi
++
+ ebegin "Running systemd-hwdb update to regenerate binary udev hardware database"
+ systemd-hwdb update --root "${ROOT}"
+ eend $?
3: dcc74cdd89c7 ! 3: bf6c3230f176 metadata/install-qa-check.d: add udev hwdb check
@@ metadata/install-qa-check.d/60udev-eclass: udev_rules_check() {
+ local need_udev_hwdb_update=0
# Check 2a: Check if udev rules must be updated
- if _dir_has_nonhidden_files "lib/udev/rules.d"
+ if _dir_has_nonhidden_files "lib/udev/rules.d" \
@@ metadata/install-qa-check.d/60udev-eclass: udev_rules_check() {
need_udev_reload=1
fi
+ # Check 2b: Check if udev binary hardware database must be updated
-+ if _dir_has_nonhidden_files "lib/udev/hwdb.d"
++ if _dir_has_nonhidden_files "lib/udev/hwdb.d" \
+ || _dir_has_nonhidden_files "usr/lib/udev/hwdb.d"; then
+ need_udev_hwdb_update=1
+ fi
--
2.53.0