[Libosinfo] [libosinfo PATCH 3/3] db: improve _guess_os_from_tree checks

Fabiano Fidêncio fabiano at fidencio.org
Sun Dec 2 15:37:59 UTC 2018


Do not check against a distro that has all the treeinfo attribute as
NULL as match_regex() would just match whatever we compare to it.

Signed-off-by: Fabiano Fidêncio <fabiano at fidencio.org>
---
 osinfo/osinfo_db.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index fa14c6d..3bdc4c8 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -763,6 +763,9 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
             const gchar *os_version = osinfo_tree_get_treeinfo_version(os_tree);
             const gchar *os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
 
+            if (os_family == NULL && os_variant == NULL && os_version == NULL && os_arch == NULL)
+                continue;
+
             if (match_regex(os_family, tree_family) &&
                 match_regex(os_variant, tree_variant) &&
                 match_regex(os_version, tree_version) &&
-- 
1.8.3.1




More information about the Libosinfo mailing list