From bbaf74ce95a3cfb83c3f5f856db363212567cc5e6dce6988e4efc4ce467956bf Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 May 2023 20:35:45 +0000 Subject: [PATCH] Accepting request 1085798 from home:ateixeira:branches:Base:System - Suppress error messages for grep command where the input file might not exist (boo#1169835) OBS-URL: https://build.opensuse.org/request/show/1085798 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=511 --- util-linux.changes | 6 ++++++ util-linux.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/util-linux.changes b/util-linux.changes index 272e76c..51ad497 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 9 19:46:41 UTC 2023 - Antonio Teixeira + +- Suppress error messages for grep command where the input file + might not exist (boo#1169835) + ------------------------------------------------------------------- Tue May 9 16:31:55 UTC 2023 - Daniel Garcia diff --git a/util-linux.spec b/util-linux.spec index c6364c0..98fd428 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -754,7 +754,7 @@ done # Perform one-time config replace. # Applies for: Update from SLE11, online update for SLE15 SP1, Leap15.1. # Not needed for /etc/default/runuser. It was first packaged after the change. -if ! grep -q "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; then +if ! grep -qs "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; then if test -f %{_sysconfdir}/default/su.rpmnew ; then if ! test -f %{_sysconfdir}/default/su.rpmorig ; then cp -a %{_sysconfdir}/default/su %{_sysconfdir}/default/su.rpmorig