From 46d8d387136cc63b9057f051216402fc818a40df Mon Sep 17 00:00:00 2001 From: Leo Puvilland Date: Dec 06 2021 08:48:13 +0000 Subject: [PATCH 1/2] Fix change in naming Signed-off-by: Akashdeep Dhar --- diff --git a/mdapi-get_repo_md b/mdapi-get_repo_md index 9b32bb3..2b0f050 100755 --- a/mdapi-get_repo_md +++ b/mdapi-get_repo_md @@ -502,6 +502,9 @@ def main(): '%s/pub/epel/testing/%s/x86_64/repodata', ] } + # We can remove this once all urls are migrated over to Fedora Linux + urls['Fedora'] = urls['Fedora Linux'] + fedora_repos = ['%s', '%s-updates', '%s-updates-testing'] epel_repos = ['%s', '%s-testing'] @@ -512,7 +515,8 @@ def main(): continue version = release['version'] for idx, url in enumerate(urls[release['name']]): - if release['name'] == 'Fedora': + # We can remove this once all urls are migrated over to Fedora Linux + if release['name'] in ('Fedora Linux', 'Fedora'): name = fedora_repos[idx] % release['koji_name'] elif release['name'] == 'Fedora EPEL' and version == "8": name = epel_repos[idx] % release['koji_name'] @@ -550,4 +554,4 @@ def main(): if __name__ == '__main__': - main() + main() \ No newline at end of file From f09b9aae4661132bf070ac61e3c0912adb65bd1d Mon Sep 17 00:00:00 2001 From: Akashdeep Dhar Date: Dec 06 2021 08:49:13 +0000 Subject: [PATCH 2/2] Rename key from Fedora to Fedora Linux Signed-off-by: Akashdeep Dhar --- diff --git a/mdapi-get_repo_md b/mdapi-get_repo_md index 2b0f050..b5a1a1c 100755 --- a/mdapi-get_repo_md +++ b/mdapi-get_repo_md @@ -490,7 +490,7 @@ def main(): repositories.append((url, f'src_{release["koji_name"]}')) urls = { - 'Fedora': + 'Fedora Linux': [ '%s/pub/fedora/linux/releases/%s/Everything/x86_64/os/repodata', '%s/pub/fedora/linux/updates/%s/Everything/x86_64/repodata', @@ -502,9 +502,7 @@ def main(): '%s/pub/epel/testing/%s/x86_64/repodata', ] } - # We can remove this once all urls are migrated over to Fedora Linux urls['Fedora'] = urls['Fedora Linux'] - fedora_repos = ['%s', '%s-updates', '%s-updates-testing'] epel_repos = ['%s', '%s-testing'] @@ -515,7 +513,6 @@ def main(): continue version = release['version'] for idx, url in enumerate(urls[release['name']]): - # We can remove this once all urls are migrated over to Fedora Linux if release['name'] in ('Fedora Linux', 'Fedora'): name = fedora_repos[idx] % release['koji_name'] elif release['name'] == 'Fedora EPEL' and version == "8":