PR#74: libmodulemd fixes - modularity/fedmod

modularity / fedmod

#74 libmodulemd fixes

Merged 5 years ago by karsten. Opened 5 years ago by karsten.

modularity/ karsten/fedmod libmodulemd into master

disable updates for now, move that to a new issue

Karsten Hopp • 5 years ago

9c6fa9d

break out unrelated commit

Karsten Hopp • 5 years ago

97a1e3f

add module updates

Karsten Hopp • 5 years ago

a1872b0

libmodulemd fixes

Karsten Hopp • 5 years ago

2bf86b3

src/_fedmod/_fetchrepodata.py

file modified

+8 -4

		`@@ -23,10 +23,10 @@`
		`FALLBACK_STREAM = 'master'`
		`STREAM = 'f28'`
		`ARCH = 'x86_64'`
		`- _F28_MODULAR_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/development/28/Modular/"`
		`- _F28_MAIN_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/development/28/Everything/"`
		`- # F28 updates repo is empty until F28 is released, and the structure is still evolving`
		`- #_F28_UPDATES_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Everything/"`
		`+ _F28_MODULAR_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/releases/28/Modular/"`
		`+ _F28_MAIN_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/"`
		`+ _F28_UPDATES_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Everything/"`
		`+ #_F28_MODULAR_UPDATES_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Modular/"`

		`class MissingMetadata(Exception):`
		`"""Reports failure to find the local metadata cache"""`
		`@@ -60,6 +60,8 @@`

		`_x86_64_MODULE_INFO = _define_repo(_F28_MODULAR_REPO, "f28-modular", ARCH)`
		`_SOURCE_MODULE_INFO = _define_repo(_F28_MODULAR_REPO, "f28-modular")`
		`+ #_x86_64_MODULE_UPDATES_INFO = _define_repo(_F28_MODULAR_UPDATES_REPO, "f28-modular-updates", ARCH)`
		`+ #_SOURCE_MODULE_UPDATES_INFO = _define_repo(_F28_MODULAR_UPDATES_REPO, "f28-modular-updates")`
		`_x86_64_PACKAGE_INFO = _define_repo(_F28_MAIN_REPO, "f28-packages", ARCH)`
		`_SOURCE_PACKAGE_INFO = _define_repo(_F28_MAIN_REPO, "f28-packages")`
		`#_x86_64_UPDATES_INFO = _define_repo(_F28_UPDATES_REPO, "f28-updates", ARCH)`
		`@@ -67,6 +69,8 @@`
		`_ALL_REPOS = (`
		`_x86_64_MODULE_INFO,`
		`_SOURCE_MODULE_INFO,`
		`+ # _x86_64_MODULE_UPDATES_INFO,`
		`+ # _SOURCE_MODULE_UPDATES_INFO,`
		`_x86_64_PACKAGE_INFO,`
		`_SOURCE_PACKAGE_INFO,`
		`# _x86_64_UPDATES_INFO,`

src/_fedmod/module_generator.py

file modified

-1

		`@@ -1,4 +1,3 @@`
		`- import modulemd`
otaylor commented 5 years ago Really better as a separate commit, even if the same PR.
		`import logging`

		`from gi.repository import Modulemd`

karsten commented 5 years ago

Update download paths

sgallagh commented on line 11 of src/_fedmod/_fetchrepodata.py 5 years ago

I think this needs to stop being commented out, now that it's released.

sgallagh commented on line 11 of src/_fedmod/_fetchrepodata.py 5 years ago

Oh, actually this is also wrong: we need _F28_UPDATES_REPO and F28_MODULAR_UPDATES_REPO, don't we?

This presumably will require additional changes later to consume them properly.

1 new commit added

add module updates

5 years ago

otaylor commented on line 2 of src/_fedmod/module_generator.py 5 years ago

Really better as a separate commit, even if the same PR.

otaylor commented on line 12 of src/_fedmod/_fetchrepodata.py 5 years ago

This looks like it will require changes to how _write_lookup_caches() reads module info - though I'm not entirely sure how the modules from the modular updates repo should be merged with the modules from the base modular repo - I'd guess if there's a module with the same name:stream in the updates repo, it should replace the module in the base modular repo entirely.

2 new commits added