diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2019-02-07 08:35:24 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2019-02-12 20:24:58 +0100 |
| commit | 410993d7930de15ccc4a36f7497353a0410e696e (patch) | |
| tree | 2ed727d9b37a9849b78ce0a2dac18c8eb5c369fc | |
| parent | 53e5dd13e2c394dc79db6103dfbfcf8e6632aa65 (diff) | |
| download | libosinfo-410993d7930de15ccc4a36f7497353a0410e696e.tar.gz | |
media: Make _supports_installer_script() aware of media installers
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>
| -rw-r--r-- | osinfo/osinfo_media.c | 3 | ||||
| -rw-r--r-- | tests/test-media.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index 6720736..9f77504 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -1661,7 +1661,8 @@ gboolean osinfo_media_supports_installer_script(OsinfoMedia *media) os = osinfo_media_get_os(media); list = osinfo_os_get_install_script_list(os); - if (osinfo_list_get_length(OSINFO_LIST(list)) == 0) { + if (osinfo_list_get_length(OSINFO_LIST(list)) == 0 && + osinfo_list_get_length(OSINFO_LIST(media->priv->scripts)) == 0) { ret = FALSE; goto cleanup; } diff --git a/tests/test-media.c b/tests/test-media.c index e8bd702..517dd97 100644 --- a/tests/test-media.c +++ b/tests/test-media.c @@ -134,6 +134,8 @@ test_loaded_installer_script(void) g_assert_cmpint(list_len, ==, 1); media = OSINFO_MEDIA(osinfo_list_get_nth(OSINFO_LIST(list), 0)); + g_assert_true(osinfo_media_supports_installer_script(media)); + scripts = osinfo_media_get_install_script_list(media); g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(scripts)), ==, 1); |