Merge branch 'master' into 2.0-dev

Author: sgallagher

modulemd/v1/include/modulemd-1.0/private/modulemd-util.h

@@ -25,7 +25,8 @@ modulemd_error_quark (void);
 
 enum ModulemdError
 {
-  MODULEMD_ERROR_PROGRAMMING
+  MODULEMD_ERROR_PROGRAMMING,
+  MODULEMD_ERROR_MISSING_CONTENT
 };
 
 GHashTable *

modulemd/v1/modulemd-util.c

@@ -370,6 +370,7 @@ module_index_from_data (GPtrArray *data, GError **error)
   gsize i = 0;
   gsize j = 0;
   g_autofree gchar *module_name = NULL;
+  g_autofree gchar *stream_name = NULL;
   g_autoptr (ModulemdImprovedModule) module = NULL;
   ModulemdImprovedModule *stored_module = NULL;
   ModulemdModuleStream *stream = NULL;
@@ -404,6 +405,18 @@ module_index_from_data (GPtrArray *data, GError **error)
         {
           stream = MODULEMD_MODULESTREAM (item);
           module_name = modulemd_modulestream_get_name (stream);
+          stream_name = modulemd_modulestream_get_stream (stream);
+
+          if (!module_name || !stream_name)
+            {
+              g_set_error (error,
+                           MODULEMD_ERROR,
+                           MODULEMD_ERROR_MISSING_CONTENT,
+                           "Module streams without a module name or stream "
+                           "name may not be read into an index.");
+              return NULL;
+            }
+
           module = get_or_create_module_from_index (module_index, module_name);
 
           /* Add the stream to this module. Note: if the same stream name
@@ -441,6 +454,7 @@ module_index_from_data (GPtrArray *data, GError **error)
 
       g_clear_pointer (&module, g_object_unref);
       g_clear_pointer (&module_name, g_free);
+      g_clear_pointer (&stream_name, g_free);
     }
 
   /* Iterate through the translations and associate them to the appropriate

modulemd/v1/tests/test-modulemd-yaml.c

@@ -492,10 +492,9 @@ modulemd_yaml_test_index_from_string (YamlFixture *fixture,
   ModulemdImprovedModule *module = NULL;
 
   yaml_string =
-    "document: modulemd\nversion: 2\ndata:\n    name: Foo\n    summary: Foo\n "
-    "   "
-    "description: >\n        Bar\n    license:\n        module:\n        - "
-    "MIT";
+    "document: modulemd\nversion: 2\ndata:\n    name: Foo\n    stream: Foo\n  "
+    "  summary: Foo\n    description: >\n        Bar\n    license:\n        "
+    "module:\n        - zMIT";
 
   module_index =
     parse_module_index_from_string (yaml_string, &failures, &error);