[gnome-builder] flatpak: handle empty string for branch



commit 8a72eddaa14da43ae39168c2ea5ec55f084a1fd5
Author: Christian Hergert <chergert redhat com>
Date:   Thu Mar 14 10:42:55 2019 -0700

    flatpak: handle empty string for branch
    
    This can happen when parsing runtime triplets.

 src/plugins/flatpak/gbp-flatpak-application-addin.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c 
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index feddde9ed..d3d953d20 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -878,9 +878,9 @@ gbp_flatpak_application_addin_has_runtime (GbpFlatpakApplicationAddin *self,
           const gchar *ref_arch = flatpak_ref_get_arch (FLATPAK_REF (ref));
           const gchar *ref_branch = flatpak_ref_get_branch (FLATPAK_REF (ref));
 
-          if (g_strcmp0 (id, ref_id) == 0 &&
-              (branch == NULL || (g_strcmp0 (branch, ref_branch) == 0)) &&
-              g_strcmp0 (arch, ref_arch) == 0)
+          if (ide_str_equal0 (id, ref_id) &&
+              ide_str_equal0 (arch, ref_arch) &&
+              (ide_str_empty0 (branch) || ide_str_equal0 (branch, ref_branch)))
             IDE_RETURN (TRUE);
         }
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]