From aaead2f54b1440eac685e6cc1c0401883a2dac2f Mon Sep 17 00:00:00 2001 From: Rob Nagler <5495179+robnagler@users.noreply.github.com> Date: Tue, 30 Apr 2024 13:26:01 -0600 Subject: [PATCH] Fix #490 chown xargs --no-run-if-empty (#491) --- rsconf/package_data/spamd/main.sh.jinja | 2 +- tests/pkcli/build_data/1.out/srv/host/v4.radia.run/spamd.sh | 2 +- tests/pkcli/build_data/1.out/srv/host/v9.radia.run/spamd.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rsconf/package_data/spamd/main.sh.jinja b/rsconf/package_data/spamd/main.sh.jinja index f4a7780e..256bbcec 100644 --- a/rsconf/package_data/spamd/main.sh.jinja +++ b/rsconf/package_data/spamd/main.sh.jinja @@ -2,7 +2,7 @@ spamd_main() { find {{ spamd.sa_update_keys_d }} ! -user root \ - | xargs chown root:root + | xargs --no-run-if-empty chown root:root # replace logrotate, which limits rotations and restarts spamd # sought.conf is removed, but Red Hat won't fix: # https://bugzilla.redhat.com/show_bug.cgi?id=1630362 diff --git a/tests/pkcli/build_data/1.out/srv/host/v4.radia.run/spamd.sh b/tests/pkcli/build_data/1.out/srv/host/v4.radia.run/spamd.sh index 1086cc44..3efc74ed 100644 --- a/tests/pkcli/build_data/1.out/srv/host/v4.radia.run/spamd.sh +++ b/tests/pkcli/build_data/1.out/srv/host/v4.radia.run/spamd.sh @@ -25,7 +25,7 @@ rsconf_install_file '/etc/systemd/system/spamd.service' 'f42ec8d8a0eaa370b3853dc spamd_main() { find /etc/mail/spamassassin/sa-update-keys ! -user root \ - | xargs chown root:root + | xargs --no-run-if-empty chown root:root # replace logrotate, which limits rotations and restarts spamd # sought.conf is removed, but Red Hat won't fix: # https://bugzilla.redhat.com/show_bug.cgi?id=1630362 diff --git a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/spamd.sh b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/spamd.sh index cd8993b9..8a0bd398 100644 --- a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/spamd.sh +++ b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/spamd.sh @@ -25,7 +25,7 @@ rsconf_install_file '/etc/systemd/system/spamd.service' 'f42ec8d8a0eaa370b3853dc spamd_main() { find /etc/mail/spamassassin/sa-update-keys ! -user root \ - | xargs chown root:root + | xargs --no-run-if-empty chown root:root # replace logrotate, which limits rotations and restarts spamd # sought.conf is removed, but Red Hat won't fix: # https://bugzilla.redhat.com/show_bug.cgi?id=1630362