From 1c1b33840f0cdbd07eae01f6cd1bcffc5ff59d60 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 28 Jun 2018 15:13:06 -0700 Subject: [PATCH] Work around an anaconda logging bug that showed up today https://github.com/rhinstaller/anaconda/pull/1519 should fix it on the anaconda side, till that's merged, we need this. Signed-off-by: Adam Williamson --- tests/_check_install_source.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/_check_install_source.pm b/tests/_check_install_source.pm index 06990032..7b811a7c 100644 --- a/tests/_check_install_source.pm +++ b/tests/_check_install_source.pm @@ -41,8 +41,12 @@ sub run { # text 'anaconda' at the level of grep, as the string we're # actually matching on literally has 'anaconda' in it. We need # (added|enabled) till F28 goes EOL: the log line was changed - # in Rawhide after F28 came out. - assert_script_run 'grep "\(added\|enabled\) repo: ' . "'anaconda'.*${repourl}" . '" /tmp/packaging.log'; + # in Rawhide after F28 came out. ('anaconda'|'') is a work + # around for an anaconda bug that only appears in F29-era + # Rawhide, can be removed when a build with + # https://github.com/rhinstaller/anaconda/pull/1519 + # is done. + assert_script_run 'grep "\(added\|enabled\) repo: ' . "\\('anaconda'\\|''\\).*${repourl}" . '" /tmp/packaging.log'; } send_key "ctrl-alt-f6";