From cef45346b6598deda629ea4f23ca8c4c315aa221 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 2 May 2018 15:35:50 -0700 Subject: [PATCH] Try to fix up some errors in fedora-repos baseurls in F28 This is breaking all f28 update tests, sigh. Signed-off-by: Adam Williamson --- lib/utils.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/utils.pm b/lib/utils.pm index 9bcc09d0..b4a7a592 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -376,6 +376,12 @@ sub _repo_setup_updates { # have not been updated, and the infra repo is rejected as its # metadata checksum isn't known to MM assert_script_run "sed -i -e 's,^metalink,#metalink,g' -e 's,^#baseurl,baseurl,g' /etc/yum.repos.d/fedora*.repo"; + # fix up some errors in fedora-repos baseurls in F28: + # https://pagure.io/fedora-repos/issue/70 + if (get_var("VERSION") == 28) { + assert_script_run 'sed -i -e "s,^\(#baseurl.*/\)os/$,\1,g" /etc/yum.repos.d/fedora*updates*.repo'; + assert_script_run 'sed -i -e "s,/testing-modular/,,g" /etc/yum.repos.d/fedora*updates*.repo'; + } if (get_var("OFW")) { # the uncommented baseurl line must be changed for PowerPC # from download.fedoraproject.org/pub/fedora/linux/...