From 2e3edf846387062d1a66985191a63ea52093edc7 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Jan 21 2019 10:01:20 +0000
Subject: rpm2flatpak: Handle manifests with 'id' rather than 'app-id'


Either is allowed in a flatpak-builder manifest.

---

diff --git a/_fedmod/flatpak_generator.py b/_fedmod/flatpak_generator.py
index b8386e5..005a7bb 100644
--- a/_fedmod/flatpak_generator.py
+++ b/_fedmod/flatpak_generator.py
@@ -162,12 +162,15 @@ class FlatpakGenerator(ModuleGenerator):
         self.mmd.add_profile(default_profile)
 
     def _flathub_container_yaml(self, manifest):
+        app_id = manifest.get('app-id')
+        if app_id is None:
+            app_id = manifest['id']
         yml = NoSortMapping({
             'compose': {
                 'modules': [self.pkgs[0] + ':master'],
             },
             'flatpak': NoSortMapping({
-                'id': manifest['app-id'],
+                'id': app_id,
                 'branch': 'stable',
             })
         })
diff --git a/tests/files/flatpak/eog.json b/tests/files/flatpak/eog.json
index 3627519..5e6824e 100644
--- a/tests/files/flatpak/eog.json
+++ b/tests/files/flatpak/eog.json
@@ -1,5 +1,5 @@
 {
-  "app-id": "org.gnome.eog",
+  "id": "org.gnome.eog",
   "runtime": "org.gnome.Platform",
   "runtime-version": "3.30",
   "sdk": "org.gnome.Sdk",
diff --git a/tests/files/flatpak/eog.yaml b/tests/files/flatpak/eog.yaml
index 1c26a29..bac8625 100644
--- a/tests/files/flatpak/eog.yaml
+++ b/tests/files/flatpak/eog.yaml
@@ -1,3 +1,4 @@
+# eog.json has id so that we test both
 app-id: org.gnome.eog
 runtime: org.gnome.Platform
 runtime-version: '3.30'