[flatpaks/flatpak-runtime] f45: Parameterize stream and ID prefix in the modulemd output

[flatpaks/flatpak-runtime] f45: Parameterize stream and ID prefix in the modulemd output

[Owen W. Taylor]

A new commit has been pushed.

Repo   : flatpaks/flatpak-runtime
Branch : f45
Commit : a27c6d290111c7cc72002b3222ad4da4c426257a
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date   : 2020-03-20T21:51:58+01:00
Stats  : +21/-12 in 3 file(s)
URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/a27c6d290111c7cc72002b3222ad4da4c426257a?branch=f45

Log:
Parameterize stream and ID prefix in the modulemd output

---
diff --git a/flatpak-runtime.in.yaml b/flatpak-runtime.in.yaml
index b51c621..18fdce3 100644
--- a/flatpak-runtime.in.yaml
+++ b/flatpak-runtime.in.yaml
@@ -12,9 +12,9 @@ data:
         module: [ MIT ]
     dependencies:
         buildrequires:
-            platform: f30
+            platform: @STREAM@
         requires:
-            platform: f30
+            platform: @STREAM@
     profiles:
         runtime:
             rpms: []
@@ -42,19 +42,19 @@ data:
         # This is used when building applications against this module so that
         # the resulting Flatpak will embed a reference to the correct runtime
         flatpak:
-            branch: f30
+            branch: @STREAM@
             runtimes:
                 # Map from profile name to pre-profile information - the
                 # profile named 'runtime' is the default.
                 runtime:
-                    id: org.fedoraproject.Platform
-                    sdk: org.fedoraproject.Sdk
+                    id: @ID_PREFIX@.Platform
+                    sdk: @ID_PREFIX@.Sdk
                 sdk:
-                    id: org.fedoraproject.Sdk
-                    sdk: org.fedoraproject.Platform
+                    id: @ID_PREFIX@.Sdk
+                    sdk: @ID_PREFIX@.Platform
                 runtime-base:
-                    id: org.fedoraproject.BasePlatform
-                    sdk: org.fedoraproject.BaseSdk
+                    id: @ID_PREFIX@.BasePlatform
+                    sdk: @ID_PREFIX@.BaseSdk
                 sdk-base:
-                    id: org.fedoraproject.BaseSdk
-                    sdk: org.fedoraproject.BasePlatform
+                    id: @ID_PREFIX@.BaseSdk
+                    sdk: @ID_PREFIX@.BasePlatform

diff --git a/tools/generate-modulemd.py b/tools/generate-modulemd.py
index 6d895aa..b1a45b7 100755
--- a/tools/generate-modulemd.py
+++ b/tools/generate-modulemd.py
@@ -1,9 +1,16 @@
 #!/usr/bin/python3
 import sys
 from yaml_utils import ordered_load, ordered_dump
+from util import ID_PREFIX, STREAM
 
 with open('flatpak-runtime.in.yaml') as f:
-    modulemd = ordered_load(f)
+    modulemd_string = f.read()
+
+modulemd_string = modulemd_string \
+    .replace('@ID_PREFIX@', ID_PREFIX) \
+    .replace('@STREAM@', STREAM)
+
+modulemd = ordered_load(modulemd_string)
 
 def set_profile(profile_name, list_file):
     with open(list_file) as f:

diff --git a/tools/util.py b/tools/util.py
index 223245f..3f18fa6 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -7,6 +7,8 @@ import sys
 import xml.etree.ElementTree as ET
 import xml.sax
 
+STREAM = 'f30'
+ID_PREFIX = 'org.fedoraproject'
 DATASET_ARG = '--dataset=f30'
 
 XDG_CACHE_HOME = os.environ.get("XDG_CACHE_HOME") or os.path.expanduser("~/.cache")