clearlinux/swupd-server
2
0
Fork 0
mirror of https://github.com/clearlinux/swupd-server.git synced 2026-08-28 13:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace explicit os-core subtraction

Browse Source 
Now that much of the includes plumbing present on the output/subtract
side, make sure all non os-core manifests explicitly include os-core,
and then use the new extra semantics of subtract_manifests() to subtract
all included bundles, not just os-core.
This commit is contained in:
William Douglas
2016-03-17 19:43:25 +00:00
parent 79e8a12b75
commit 4fb32c570f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+7 -3
View File
@@ -388,7 +388,7 @@ int main(int argc, char **argv)
while (name_includes) {
char *name = name_includes->data;
name_includes = g_list_next(name_includes);
manifest_includes = g_list_prepend(manifest_includes, g_hash_table_lookup(new_manifests, name));
manifest_includes = g_list_prepend(manifest_includes, g_hash_table_lookup(old_manifests, name));
}
manifest->includes = manifest_includes;
}
@@ -415,9 +415,13 @@ int main(int argc, char **argv)
apply_heuristics(newm);
newm->prevversion = oldm->version;
/* add os-core as an included manifest */
oldm->includes = g_list_prepend(oldm->includes, old_core);
newm->includes = g_list_prepend(newm->includes, new_core);
/* Step 5: Subtract the core files from the manifest */
subtract_manifests_frontend(oldm, old_core);
subtract_manifests_frontend(newm, new_core);
subtract_manifests_frontend(oldm, oldm);
subtract_manifests_frontend(newm, newm);
/* Step 6: Compare manifest to the previous version... */
if (match_manifests(oldm, newm) == 0) {