clearlinux/swupd-client
2
0
Fork 0
mirror of https://github.com/clearlinux/swupd-client.git synced 2026-10-03 23:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for deleted file accounting

Browse Source 
With the recent change to swupd-server that removes old deleted files in
the initial manifests for a new format, the case in which these files
are absent from the new manifest should not be counted as deleted.

Also, fix another deleted file accounting issue: the file could have
been deleted anywhere in the range current < N <= new, not just at the
latest (new) version.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This commit is contained in:
Patrick McCarty
2016-04-15 14:14:49 -07:00
parent bdeff015dc
commit 7b14eddad8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manifest.c
+7 -2
View File
@@ -654,14 +654,19 @@ void link_manifests(struct manifest *m1, struct manifest *m2)
if (((file2->last_change == m2->version) || (file2->last_change > m1->version)) && !file2->is_deleted) {
account_changed_file();
}
if (file2->last_change == m2->version && file2->is_deleted) {
if (file2->last_change > m1->version && file2->is_deleted) {
account_deleted_file();
}
continue;
}
if (ret < 0) { /* m1/file1 is before m2/file2 */
/* File is absent in m2, indicating that a format bump
* happened, removing deleted file entries from the
* previous format(s). Do not account the deleted file
* in this case, since an update will not delete the
* file.
*/
list1 = list1->next;
account_deleted_file();
continue;
} /* else ret > 0 m1/file1 is after m2/file2 */
list2 = list2->next;