packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2720 from lucab/ups/lib-deploy-ignore-result 

lib/sysroot-deploy: explicitly handle `g_variant_lookup` results
This commit is contained in:
Luca Bruno 2022-09-26 12:40:04 +00:00 committed by GitHub
parent f442f02c15 a1018840f4
commit 4e51f22145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-sysroot-deploy.c
View File

@ -2005,7 +2005,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
&variant, NULL)) &variant, NULL))
{ {
metadata = g_variant_get_child_value (variant, 0); metadata = g_variant_get_child_value (variant, 0);
g_variant_lookup (metadata, OSTREE_COMMIT_META_KEY_VERSION, "s", &deployment_version); (void) g_variant_lookup (metadata, OSTREE_COMMIT_META_KEY_VERSION, "s", &deployment_version);
} }
} }
@ -2232,7 +2232,7 @@ get_deployment_ostree_version (OstreeRepo *repo,
if (ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, csum, &variant, NULL)) if (ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, csum, &variant, NULL))
{ {
g_autoptr(GVariant) metadata = g_variant_get_child_value (variant, 0); g_autoptr(GVariant) metadata = g_variant_get_child_value (variant, 0);
g_variant_lookup (metadata, OSTREE_COMMIT_META_KEY_VERSION, "s", &version); (void) g_variant_lookup (metadata, OSTREE_COMMIT_META_KEY_VERSION, "s", &version);
} }
return g_steal_pointer (&version); return g_steal_pointer (&version);