#96 rpm2flatpak: Handle manifests with 'id' rather than 'app-id'
Merged 5 months ago by nphilipp. Opened 5 months ago by otaylor.
modularity/ otaylor/fedmod manifest-app-id  into  master

file modified
+4 -1

@@ -162,12 +162,15 @@ 

          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',

              })

          })

file modified
+1 -1

@@ -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",

@@ -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'

Either is allowed in a flatpak-builder manifest.

Metadata Update from @nphilipp:
- Request assigned

5 months ago

Looks good to me. I'll rebase on master/#95 and apply.

rebased onto 2e3edf8

5 months ago

Pull-Request has been merged by nphilipp

5 months ago