From 2bf86b3df0fc270da60d1af87d49729f7b25f270 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: May 08 2018 13:45:19 +0000
Subject: [PATCH 1/4] libmodulemd fixes


---

diff --git a/src/_fedmod/_fetchrepodata.py b/src/_fedmod/_fetchrepodata.py
index 78fd4e4..584cadb 100644
--- a/src/_fedmod/_fetchrepodata.py
+++ b/src/_fedmod/_fetchrepodata.py
@@ -23,10 +23,10 @@ log = logging.getLogger(__name__)
 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_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_UPDATES_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Modular/"
 
 class MissingMetadata(Exception):
     """Reports failure to find the local metadata cache"""
diff --git a/src/_fedmod/module_generator.py b/src/_fedmod/module_generator.py
index a088304..e061786 100644
--- a/src/_fedmod/module_generator.py
+++ b/src/_fedmod/module_generator.py
@@ -1,4 +1,3 @@
-import modulemd
 import logging
 
 from gi.repository import Modulemd

From a1872b06e3b09c39f241aa389ac7378c5ceaf391 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: May 09 2018 11:34:42 +0000
Subject: [PATCH 2/4] add module updates


---

diff --git a/src/_fedmod/_fetchrepodata.py b/src/_fedmod/_fetchrepodata.py
index 584cadb..be79b79 100644
--- a/src/_fedmod/_fetchrepodata.py
+++ b/src/_fedmod/_fetchrepodata.py
@@ -25,8 +25,8 @@ STREAM = 'f28'
 ARCH = 'x86_64'
 _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_UPDATES_REPO = "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Modular/"
+_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,17 +60,21 @@ def _define_repo(remote_prefix, local_cache_name, arch=None):
 
 _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)
-#_SOURCE_UPDATES_INFO = _define_repo(_F28_UPDATES_REPO, "f28-updates")
+_x86_64_UPDATES_INFO = _define_repo(_F28_UPDATES_REPO, "f28-updates", ARCH)
+_SOURCE_UPDATES_INFO = _define_repo(_F28_UPDATES_REPO, "f28-updates")
 _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,
-#    _SOURCE_UPDATES_INFO,
+    _x86_64_UPDATES_INFO,
+    _SOURCE_UPDATES_INFO,
 )
 
 _LOOKUP_CACHES = {
diff --git a/src/_fedmod/module_generator.py b/src/_fedmod/module_generator.py
index e061786..a088304 100644
--- a/src/_fedmod/module_generator.py
+++ b/src/_fedmod/module_generator.py
@@ -1,3 +1,4 @@
+import modulemd
 import logging
 
 from gi.repository import Modulemd

From 97a1e3fe8a80f3be76bd5059593a0c76c46407a4 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: May 09 2018 11:42:11 +0000
Subject: [PATCH 3/4] break out unrelated commit


---

diff --git a/src/_fedmod/module_generator.py b/src/_fedmod/module_generator.py
index a088304..e061786 100644
--- a/src/_fedmod/module_generator.py
+++ b/src/_fedmod/module_generator.py
@@ -1,4 +1,3 @@
-import modulemd
 import logging
 
 from gi.repository import Modulemd

From 9c6fa9db173dbabad02290013f34e84500d623df Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: May 14 2018 09:00:03 +0000
Subject: [PATCH 4/4] disable updates for now, move that to a new issue


---

diff --git a/src/_fedmod/_fetchrepodata.py b/src/_fedmod/_fetchrepodata.py
index be79b79..c883a73 100644
--- a/src/_fedmod/_fetchrepodata.py
+++ b/src/_fedmod/_fetchrepodata.py
@@ -26,7 +26,7 @@ ARCH = 'x86_64'
 _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/"
+#_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,21 +60,21 @@ def _define_repo(remote_prefix, local_cache_name, arch=None):
 
 _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_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)
-_SOURCE_UPDATES_INFO = _define_repo(_F28_UPDATES_REPO, "f28-updates")
+#_x86_64_UPDATES_INFO = _define_repo(_F28_UPDATES_REPO, "f28-updates", ARCH)
+#_SOURCE_UPDATES_INFO = _define_repo(_F28_UPDATES_REPO, "f28-updates")
 _ALL_REPOS = (
     _x86_64_MODULE_INFO,
     _SOURCE_MODULE_INFO,
-    _x86_64_MODULE_UPDATES_INFO,
-    _SOURCE_MODULE_UPDATES_INFO,
+#    _x86_64_MODULE_UPDATES_INFO,
+#    _SOURCE_MODULE_UPDATES_INFO,
     _x86_64_PACKAGE_INFO,
     _SOURCE_PACKAGE_INFO,
-    _x86_64_UPDATES_INFO,
-    _SOURCE_UPDATES_INFO,
+#    _x86_64_UPDATES_INFO,
+#    _SOURCE_UPDATES_INFO,
 )
 
 _LOOKUP_CACHES = {