Compare commits

..
2 Commits
Author SHA1 Message Date
Patrick McCarty e78ef77e06 Release v3.2.1
This release fixes a sorting issue with bundle manifests: they should be
version sorted, not filename sorted.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2016-04-05 23:51:22 -07:00
Patrick McCarty a329cc93a9 Fix sorting issue with bundle manifests
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2016-04-05 23:50:42 -07:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.66]) AC_PREREQ([2.66])
AC_INIT(swupd-server, 3.2.0, timothy.c.pepper@linux.intel.com) AC_INIT(swupd-server, 3.2.1, timothy.c.pepper@linux.intel.com)
AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects]) AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_PROG_CC AC_PROG_CC
+2 -2
View File
@@ -342,9 +342,9 @@ int main(int argc, char **argv)
/* Detect renamed files specifically for each pack */ /* Detect renamed files specifically for each pack */
// rename_detection(...); // rename_detection(...);
old_deleted = remove_old_deleted_files(old_core, new_core);
sort_manifest_by_version(new_core); sort_manifest_by_version(new_core);
newfiles = prune_manifest(new_core); newfiles = prune_manifest(new_core);
old_deleted = remove_old_deleted_files(old_core, new_core);
if (newfiles <= 0) { if (newfiles <= 0) {
LOG(NULL, "", "Core component has not changed (after pruning), exiting"); LOG(NULL, "", "Core component has not changed (after pruning), exiting");
printf("Core component has not changed (after pruning), exiting\n"); printf("Core component has not changed (after pruning), exiting\n");
@@ -446,10 +446,10 @@ int main(int argc, char **argv)
apply_heuristics(newm); apply_heuristics(newm);
#warning missing rename_detection here #warning missing rename_detection here
/* Step 6b: otherwise, write out the manifest */ /* Step 6b: otherwise, write out the manifest */
old_deleted = remove_old_deleted_files(oldm, newm);
sort_manifest_by_version(newm); sort_manifest_by_version(newm);
type_change_detection(newm); type_change_detection(newm);
newfiles = prune_manifest(newm); newfiles = prune_manifest(newm);
old_deleted = remove_old_deleted_files(oldm, newm);
if (newfiles > 0 || old_deleted > 0 || changed_includes(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); 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); printf("%s component has changes (%d new, %d deleted), writing out new manifest\n", group, newfiles, old_deleted);