Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lukewarmtemp committed Aug 8, 2023
1 parent 4122e32 commit 8959384
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/daemon/rpmostreed-deployment-utils.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,8 @@ rpmostreed_update_generate_variant (OstreeDeployment *booted_deployment,
if (!rpm_diff_is_empty (&rpm_diff))
g_variant_dict_insert (dict, "rpm-diff", "@a{sv}", rpm_diff_variant_new (&rpm_diff));

if (!none_added_or_removed && !staged_deployment)
if (!none_added_or_removed && !staged_deployment
&& refspectype == rpmostreecxx::RefspecType::Container)
{
g_variant_dict_insert (dict, "manifest-diff", "@a{sv}", manifest_diff);
}
Expand Down Expand Up @@ -867,7 +868,8 @@ rpmostreed_update_generate_variant (OstreeDeployment *booted_deployment,

/* but if there are no updates, then just ditch the whole thing and return NULL */
refspectype = rpmostreecxx::refspec_classify (r.refspec);
if (is_new_checksum || rpmmd_modified_new || !none_added_or_removed)
if (is_new_checksum || rpmmd_modified_new
|| (!none_added_or_removed && refspectype == rpmostreecxx::RefspecType::Container))
{
/* include a "state" checksum for cache invalidation; for now this is just the
* checksum of the deployment against which we ran, though we could base it off more
Expand Down

0 comments on commit 8959384

Please sign in to comment.