From 2cae1b3c4a466fd3c78355a0e5dd2ed7382fe875 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Sep 05 2018 17:55:51 +0000
Subject: [PATCH 1/2] Flatpak: Base runtime and package branches off of the current dataset


If we use the f29 data (say) for generating a Flatpak modulemd,
then we should depend on the corresponding Flatpak runtime.

---

diff --git a/src/_fedmod/_repodata.py b/src/_fedmod/_repodata.py
index 1dedf1f..6e891ca 100644
--- a/src/_fedmod/_repodata.py
+++ b/src/_fedmod/_repodata.py
@@ -23,16 +23,18 @@ def _get_dataset():
         _load_dataset()
     return _ACTIVE_DATASET
 
+def dataset_release_name():
+    return parse_dataset_name(dataset_name)[0]
+
 def set_dataset_name(name):
     """
     Set the dataset name that will be used for further operations
 
     Raises ValueError if validation fails.
     """
+    global dataset_name
     # validates as a side effect
     parse_dataset_name(name)
-
-    global dataset_name
     dataset_name = name
 
 def list_modules():
diff --git a/src/_fedmod/flatpak_generator.py b/src/_fedmod/flatpak_generator.py
index 8ed0838..c3bcc3e 100644
--- a/src/_fedmod/flatpak_generator.py
+++ b/src/_fedmod/flatpak_generator.py
@@ -9,18 +9,22 @@ from textwrap import dedent
 import gi
 from gi.repository import Modulemd
 
+from ._repodata import dataset_release_name
 from .get_module_builds import get_module_builds
 from .module_generator import ModuleGenerator
 from .util import rpm_name_only
 from . import _depchase
 
-
-FLATPAK_RUNTIME_STREAM = 'f28'
-DEFAULT_RPM_BRANCH = 'f28'
+def dataset_release_branch():
+    release_name = dataset_release_name()
+    if release_name == 'rawhide':
+        return 'master'
+    else:
+        return release_name
 
 
 def _get_runtime_packages():
-    builds = get_module_builds('flatpak-runtime', FLATPAK_RUNTIME_STREAM)
+    builds = get_module_builds('flatpak-runtime', dataset_release_branch())
     # Each flatpak-runtime stream should be built against a single context
     assert len(builds) == 1
     build = builds[0]
@@ -34,7 +38,7 @@ def _get_runtime_packages():
 class FlatpakGenerator(ModuleGenerator):
     def __init__(self, pkg):
         super().__init__([pkg])
-        self.rpm_branch = DEFAULT_RPM_BRANCH
+        self.rpm_branch = dataset_release_branch()
 
     def _calculate_dependencies(self):
         pkg = self.pkgs[0]
@@ -50,7 +54,7 @@ class FlatpakGenerator(ModuleGenerator):
         run_srpms = {rpm_name_only(_depchase.get_srpm_for_rpm(pool, dep)) for dep in pkgs}
         self.run_srpms = run_srpms - self.api_srpms
 
-        self.module_run_deps = {'flatpak-runtime': [FLATPAK_RUNTIME_STREAM]}
+        self.module_run_deps = {'flatpak-runtime': [dataset_release_branch()]}
 
     def _update_module_md(self):
         super()._update_module_md()

From 306d948c205a8a613af00cbdbc577a876e84ac6d Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Sep 05 2018 20:14:34 +0000
Subject: [PATCH 2/2] Default to the f29 dataset


Since F29 is almost in beta, someone creating new modular data for Fedora
should be targetting F29.

---

diff --git a/src/_fedmod/_fetchrepodata.py b/src/_fedmod/_fetchrepodata.py
index 0909cea..edc9624 100644
--- a/src/_fedmod/_fetchrepodata.py
+++ b/src/_fedmod/_fetchrepodata.py
@@ -114,7 +114,7 @@ _DISTRO_RELEASES = {
         modular_repo="https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/",
     )
 }
-_DEFAULT_RELEASE_NAME = "f28"
+_DEFAULT_RELEASE_NAME = "f29"
 
 _ARCHES = set(["aarch64", "armv7hl", "i686", "ppc64", "ppc64le", "s390x", "x86_64"])
 _DEFAULT_ARCH = "x86_64"
diff --git a/tests/test_flatpak_generator.py b/tests/test_flatpak_generator.py
index caeefed..95f1f66 100644
--- a/tests/test_flatpak_generator.py
+++ b/tests/test_flatpak_generator.py
@@ -76,8 +76,8 @@ class TestFlatpak(object):
 
         buildrequires = dependencies[0].props.buildrequires
         assert set(buildrequires) == {'flatpak-runtime',}
-        assert buildrequires['flatpak-runtime'].get() == ['f28']
+        assert buildrequires['flatpak-runtime'].get() == ['f29']
 
         requires = dependencies[0].props.requires
         assert set(requires) == {'flatpak-runtime',}
-        assert requires['flatpak-runtime'].get() == ['f28']
+        assert requires['flatpak-runtime'].get() == ['f29']