mirror of
https://github.com/clearlinux/swupd-server.git
synced 2026-11-21 23:05:22 +00:00
Move removal of old deleted files to a new function
Since removing of all of the matching deleted files between a build with an older manifest format and current needs to happen *after* match_manifests() finishes accounting for new and deleted entries in the manifests, simply move the logic into a separate function to be called after match_manifests(). Because one or more file deletions should trigger a fresh bundle manifest creation, account for the return value of this new function in addition to the result of manifest pruning and whether any bundle includes were changed. Since "os-core" is treated specially, and it's expected to contain changed files for every build, only the non-"os-core" bundle manifests need the trigger. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This commit is contained in:
@@ -178,6 +178,7 @@ extern void sort_manifest_by_version(struct manifest *manifest);
|
||||
extern bool manifest_includes(struct manifest *manifest, char *component);
|
||||
extern bool changed_includes(struct manifest *old, struct manifest *new);
|
||||
extern int prune_manifest(struct manifest *manifest);
|
||||
extern int remove_old_deleted_files(struct manifest *m1, struct manifest *m2);
|
||||
extern void create_manifest_delta(int oldversion, int newversion, char *module);
|
||||
extern void create_manifest_deltas(struct manifest *manifest, GList *last_versions_list);
|
||||
extern void subtract_manifests_frontend(struct manifest *m1, struct manifest *m2);
|
||||
|
||||
+15
-5
@@ -227,6 +227,7 @@ int main(int argc, char **argv)
|
||||
GHashTable *old_manifests = g_hash_table_new(g_str_hash, g_str_equal);
|
||||
GList *manifests_last_versions_list = NULL;
|
||||
int newfiles = 0;
|
||||
int old_deleted = 0;
|
||||
|
||||
struct timeval current_time;
|
||||
struct timeval previous_time;
|
||||
@@ -295,6 +296,13 @@ int main(int argc, char **argv)
|
||||
apply_heuristics(old_full);
|
||||
apply_heuristics(new_full);
|
||||
match_manifests(old_full, new_full);
|
||||
|
||||
old_deleted = remove_old_deleted_files(old_full, new_full);
|
||||
if (old_deleted > 0) {
|
||||
LOG(NULL, "", "Old deleted files (%d) removed from full manifest", old_deleted);
|
||||
printf("Old deleted files (%d) removed from full manifest\n", old_deleted);
|
||||
}
|
||||
|
||||
apply_heuristics(new_full);
|
||||
#warning disabled rename detection for some simplicity
|
||||
// rename_detection(new_full);
|
||||
@@ -336,13 +344,14 @@ int main(int argc, char **argv)
|
||||
|
||||
sort_manifest_by_version(new_core);
|
||||
newfiles = prune_manifest(new_core);
|
||||
old_deleted = remove_old_deleted_files(old_core, new_core);
|
||||
if (newfiles <= 0) {
|
||||
LOG(NULL, "", "Core component has not changed (after pruning), exiting");
|
||||
printf("Core component has not changed (after pruning), exiting\n");
|
||||
goto exit;
|
||||
}
|
||||
LOG(NULL, "", "Core component has changes (%d), writing out new manifest", newfiles);
|
||||
printf("Core component has changes (%d), writing out new manifest\n", newfiles);
|
||||
LOG(NULL, "", "Core component has changes (%d new, %d deleted), writing out new manifest", newfiles, old_deleted);
|
||||
printf("Core component has changes (%d new, %d deleted), writing out new manifest\n", newfiles, old_deleted);
|
||||
if (write_manifest(new_core) != 0) {
|
||||
LOG(NULL, "", "Core component manifest write failed");
|
||||
printf("Core component manifest write failed\n");
|
||||
@@ -440,9 +449,10 @@ int main(int argc, char **argv)
|
||||
sort_manifest_by_version(newm);
|
||||
type_change_detection(newm);
|
||||
newfiles = prune_manifest(newm);
|
||||
if (newfiles > 0 || changed_includes(oldm, newm)) {
|
||||
LOG(NULL, "", "%s component has changes (%d), writing out new manifest", group, newfiles);
|
||||
printf("%s component has changes (%d), writing out new manifest\n", group, newfiles);
|
||||
old_deleted = remove_old_deleted_files(oldm, newm);
|
||||
if (newfiles > 0 || old_deleted > 0 || changed_includes(oldm, newm)) {
|
||||
LOG(NULL, "", "%s component has changes (%d new, %d deleted), writing out new manifest", group, newfiles, old_deleted);
|
||||
printf("%s component has changes (%d new, %d deleted), writing out new manifest\n", group, newfiles, old_deleted);
|
||||
if (write_manifest(newm) != 0) {
|
||||
LOG(NULL, "", "%s component manifest write failed", group);
|
||||
printf("%s component manifest write failed\n", group);
|
||||
|
||||
+65
-18
@@ -338,7 +338,6 @@ int match_manifests(struct manifest *m1, struct manifest *m2)
|
||||
int must_sort = 0;
|
||||
int count = 0;
|
||||
int first = 1;
|
||||
bool drop_deleted;
|
||||
|
||||
if (!m1) {
|
||||
printf("Matching manifests up failed: No old manifest!\n");
|
||||
@@ -350,14 +349,6 @@ int match_manifests(struct manifest *m1, struct manifest *m2)
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* if format incremented, we don't need to include in m2 a file
|
||||
* which was already showing deleted in m1 */
|
||||
if (m1->format < m2->format) {
|
||||
drop_deleted = true;
|
||||
} else {
|
||||
drop_deleted = false;
|
||||
}
|
||||
|
||||
m1->files = g_list_sort(m1->files, file_sort_filename);
|
||||
m2->files = g_list_sort(m2->files, file_sort_filename);
|
||||
|
||||
@@ -374,15 +365,6 @@ int match_manifests(struct manifest *m1, struct manifest *m2)
|
||||
|
||||
ret = strcmp(file1->filename, file2->filename);
|
||||
if (ret == 0) {
|
||||
if (file1->is_deleted && file2->is_deleted && drop_deleted) {
|
||||
GList *to_delete = list2;
|
||||
list1 = g_list_next(list1);
|
||||
list2 = g_list_next(list2);
|
||||
m2->files = g_list_delete_link(m2->files, to_delete);
|
||||
m2->count--;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (file1->is_deleted && file2->is_deleted && file1->is_rename) {
|
||||
file2->is_rename = file1->is_rename;
|
||||
hash_assign(file1->hash, file2->hash);
|
||||
@@ -944,6 +926,71 @@ bool changed_includes(struct manifest *old, struct manifest *new)
|
||||
return false;
|
||||
}
|
||||
|
||||
/* For a format bump, it's convenient to remove deleted files from manifests
|
||||
* that last changed prior to the format bump, since they are no longer
|
||||
* considered for deletion as part of an update.
|
||||
*
|
||||
* Note: this function should be called after match_manifests().
|
||||
*/
|
||||
int remove_old_deleted_files(struct manifest *m1, struct manifest *m2)
|
||||
{
|
||||
GList *list1, *list2;
|
||||
struct file *file1, *file2;
|
||||
int count = 0;
|
||||
|
||||
if (!m1) {
|
||||
printf("No old manifest!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!m2) {
|
||||
printf("No new manifest!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* This is the common case, so bail early, reporting no deletions */
|
||||
if (m1->format == m2->format) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* At this point, the manifest formats mismatch, and it's assumed that
|
||||
* m1 is the old manifest, and m2 is the new.
|
||||
*/
|
||||
|
||||
m1->files = g_list_sort(m1->files, file_sort_filename);
|
||||
m2->files = g_list_sort(m2->files, file_sort_filename);
|
||||
|
||||
list1 = g_list_first(m1->files);
|
||||
list2 = g_list_first(m2->files);
|
||||
|
||||
while (list1 && list2) {
|
||||
int ret;
|
||||
file1 = list1->data;
|
||||
file2 = list2->data;
|
||||
|
||||
ret = strcmp(file1->filename, file2->filename);
|
||||
if (ret == 0) {
|
||||
if (file1->is_deleted && file2->is_deleted) {
|
||||
GList *to_delete = list2;
|
||||
list1 = g_list_next(list1);
|
||||
list2 = g_list_next(list2);
|
||||
m2->files = g_list_delete_link(m2->files, to_delete);
|
||||
m2->count--;
|
||||
count++;
|
||||
continue;
|
||||
}
|
||||
list1 = g_list_next(list1);
|
||||
list2 = g_list_next(list2);
|
||||
} else if (ret < 0) {
|
||||
list1 = g_list_next(list1);
|
||||
} else {
|
||||
list2 = g_list_next(list2);
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
/* Conditionally remove some things from a manifest.
|
||||
* Returns > 0 when the pruned manifest has new files.
|
||||
* Returns 0 when the pruned manifest no longer has new files.
|
||||
|
||||
Reference in New Issue
Block a user