From: Colin Walters <walters@verbum.org>
Date: Tue, 1 Aug 2023 21:21:55 +0000 (-0400)
Subject: composefs: Only call `_get_symlink_target()` on symlinks
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2^2~31^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=15cb0b47b1fa0f21fe1c935baa23ec4cde77f1cc;p=ostree.git

composefs: Only call `_get_symlink_target()` on symlinks

This fixes a warning from newer glib that we're now seeing
in the Debian testing CI runs.
---

diff --git a/src/libostree/ostree-repo-composefs.c b/src/libostree/ostree-repo-composefs.c
index 97eb4465..40751247 100644
--- a/src/libostree/ostree-repo-composefs.c
+++ b/src/libostree/ostree-repo-composefs.c
@@ -293,7 +293,6 @@ checkout_one_composefs_file_at (OstreeRepo *repo, const char *checksum, struct l
   const guint32 source_uid = g_file_info_get_attribute_uint32 (source_info, "unix::uid");
   const guint32 source_gid = g_file_info_get_attribute_uint32 (source_info, "unix::gid");
   const guint64 source_size = g_file_info_get_size (source_info);
-  const char *source_symlink_target = g_file_info_get_symlink_target (source_info);
   const gboolean is_symlink
       = (g_file_info_get_file_type (source_info) == G_FILE_TYPE_SYMBOLIC_LINK);
 
@@ -314,6 +313,7 @@ checkout_one_composefs_file_at (OstreeRepo *repo, const char *checksum, struct l
   lcfs_node_set_size (node, source_size);
   if (is_symlink)
     {
+      const char *source_symlink_target = g_file_info_get_symlink_target (source_info);
       if (lcfs_node_set_payload (node, source_symlink_target) != 0)
         return glnx_throw_errno (error);
     }