From a57a3ec4034ac24cb0b57781479197a44fbcbacc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 9 May 2022 16:34:44 -0700 Subject: [PATCH] _check_install_source: handle change to addrepo logging in F37 Logging of additional repo setup changed recently in F37, we need to handle the new message format here. Signed-off-by: Adam Williamson --- tests/_check_install_source.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm index ab243237..713f43cb 100644 --- a/tests/_check_install_source.pm +++ b/tests/_check_install_source.pm @@ -24,8 +24,10 @@ sub run { $self->root_console; if ($addrepourl) { if ($addrepourl =~ m,^nfs://,,) { - # this line tells us it set up a repo for our URL... - assert_script_run 'grep "repo addrepo.*' . ${addrepourl} . '" /tmp/packaging.log'; + # this line tells us it set up a repo for our URL. + # "repo addrepo" is older format from before Fedora 37, + # "Add the 'addrepo" is newer format from F37+ + assert_script_run 'grep "\(repo \|Add the \'\)addrepo.*' . ${addrepourl} . '" /tmp/packaging.log'; # ...this line tells us it added the repo called 'addrepo' (