PR#120: Fix change in naming - mdapi

mdapi

#120 Fix change in naming

Closed 3 years ago by pingou. Opened 3 years ago by leo.

leo/mdapi fix-naming into master

Fix change in naming cused by pkgdb.json

Leo Puvilland • 3 years ago

c7566c6

mdapi-get_repo_md

file modified

+5 -1

		`@@ -502,6 +502,9 @@`
		`'%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 @@`
		`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']`

leo commented 3 years ago

The pkgdb.json was updated and changed Fedora to Fedora Linux. mdapi was not updated for this change.

Fixes https://pagure.io/mdapi/issue/119

pingou commented 3 years ago

Hm this doesn't work out of the box as not all the releases were updated to Fedora Linux.

This is what I have needed to do to get the script working for me:

diff --git a/mdapi-get_repo_md b/mdapi-get_repo_md
index f68c086..65e963c 100755
--- a/mdapi-get_repo_md        
+++ b/mdapi-get_repo_md        
@@ -502,6 +502,7 @@ def main():
                 '%s/pub/epel/testing/%s/x86_64/repodata',
             ]
     }
+    urls['Fedora'] = urls['Fedora Linux']
     fedora_repos = ['%s', '%s-updates', '%s-updates-testing']
     epel_repos = ['%s', '%s-testing']

@@ -512,7 +513,7 @@ def main():
             continue
         version = release['version']
         for idx, url in enumerate(urls[release['name']]):
-            if release['name'] == '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']

We likely should add a comment above these changes to say that we can get ride of/simplify these lines once all the releases in the pkgdb file have been migrated to Fedora Linux

rebased onto 1f4502a

3 years ago

rebased onto c7566c6

3 years ago