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

daemon/autoupdates: Don't insert rpm-diff if empty

Browse Source 
Canonicalize to "absent" to make it easier for clients.

Closes: #1248
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-02-14 14:27:06 +00:00 committed by Atomic Bot
parent f0e381392e
commit 57ab9844b9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -601,6 +601,16 @@ array_to_variant_new (const char *format, GPtrArray *array)
return g_variant_builder_end (&builder);
}
static gboolean
rpm_diff_is_empty (RpmDiff *diff)
{
g_assert (diff->initialized);
return !diff->upgraded->len &&
!diff->downgraded->len &&
!diff->removed->len &&
!diff->added->len;
}
static GVariant*
rpm_diff_variant_new (RpmDiff *diff)
{
@ -897,7 +907,9 @@ rpmostreed_update_generate_variant (OstreeSysroot *sysroot,
return FALSE;
}
g_variant_dict_insert (&dict, "rpm-diff", "@a{sv}", rpm_diff_variant_new (&rpm_diff));
/* don't bother inserting if there's nothing new */
if (!rpm_diff_is_empty (&rpm_diff))
g_variant_dict_insert (&dict, "rpm-diff", "@a{sv}", rpm_diff_variant_new (&rpm_diff));
/* but if there are no updates, then just ditch the whole thing and return NULL */
if (is_new_checksum || rpmmd_modified_new)