keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: only add base-checksum if pkgs layered

Browse Source 
The origin might have an empty "requested" key in the "packages"
section, which is probably an indication that packages were once added
but were then removed.

Explicitly check the length of the pkg array in case it's actually
empty before adding the base-checksum to the deployment variant.

Closes: #371
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2016-06-29 15:07:16 -04:00 committed by Atomic Bot
parent 5fb4a04e85
commit 8c76381a97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/daemon/rpmostreed-deployment-utils.c
View File

@ -223,7 +223,7 @@ rpmostreed_deployment_generate_variant (OstreeDeployment *deployment,
g_variant_dict_insert (&dict, "osname", "s", osname); g_variant_dict_insert (&dict, "osname", "s", osname);
g_variant_dict_insert (&dict, "serial", "i", serial); g_variant_dict_insert (&dict, "serial", "i", serial);
g_variant_dict_insert (&dict, "checksum", "s", csum); g_variant_dict_insert (&dict, "checksum", "s", csum);
if (origin_packages) if (origin_packages != NULL && g_strv_length (origin_packages) > 0)
{ {
const char *parent = ostree_commit_get_parent (commit); const char *parent = ostree_commit_get_parent (commit);
g_assert (parent); g_assert (parent);