[gnome-builder] flatpak: allow manifest modules to be strings

[Matthew Leeds <mwleeds src gnome org>]

commit 91529876b750edd9a485c95ea091df279eede1a0
Author: Matthew Leeds <mleeds redhat com>
Date:   Wed Dec 21 17:00:59 2016 -0600

    flatpak: allow manifest modules to be strings
    
    In flatpak manifests, a module can be a string (which refers to a
    filename), so we shouldn't print an error message in that case.

 plugins/flatpak/gbp-flatpak-runtime.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-runtime.c b/plugins/flatpak/gbp-flatpak-runtime.c
index 03d6f55..c65e1d6 100644
--- a/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/plugins/flatpak/gbp-flatpak-runtime.c
@@ -120,13 +120,18 @@ manifest_has_multiple_modules (JsonObject *object)
       return FALSE;
   else
     {
-      object = json_array_get_object_element (modules, 0);
-      if (json_object_has_member (object, "modules"))
+      JsonNode *module;
+      module = json_array_get_element (modules, 0);
+      if (JSON_NODE_HOLDS_OBJECT (module))
         {
-          modules = json_object_get_array_member (object, "modules");
-          if (modules == NULL)
-            return FALSE;
-          return (json_array_get_length (modules) > 0);
+          object = json_node_get_object (module);
+          if (json_object_has_member (object, "modules"))
+            {
+              modules = json_object_get_array_member (object, "modules");
+              if (modules == NULL)
+                return FALSE;
+              return (json_array_get_length (modules) > 0);
+            }
         }
       return FALSE;
     }