Print update/verify status message after fd leak check

In case there are file descriptor leaks, those issues would be printed
after the status message, but it should be the other way around: the
last printed message should reflect the result of the action.

Signed-off-by: Patrick McCarty <[email protected]>

Author: phmccarty

src/update.c

@@ -385,13 +385,6 @@ int main_update()
 		printf("Update was applied.\n");
 	}
 
-	if ((current_version < server_version) && (ret == 0)) {
-		printf("Update successful. System updated from version %d to version %d\n",
-		       current_version, server_version);
-	} else if (ret == 0) {
-		printf("Update complete. System already up-to-date at version %d\n", current_version);
-	}
-
 	delete_motd();
 
 	/* Run any scripts that are needed to complete update */
@@ -407,12 +400,15 @@ int main_update()
 	swupd_curl_cleanup();
 	free_subscriptions();
 	free_globals();
-
-	printf("Update exiting.\n");
-
 	v_lockfile(lock_fd);
-
 	dump_file_descriptor_leaks();
 
+	if ((current_version < server_version) && (ret == 0)) {
+		printf("Update successful. System updated from version %d to version %d\n",
+		       current_version, server_version);
+	} else if (ret == 0) {
+		printf("Update complete. System already up-to-date at version %d\n", current_version);
+	}
+
 	return ret;
 }

src/verify.c

@@ -791,6 +791,13 @@ int verify_main(int argc, char **argv)
 	/* this concludes the critical section, after this point it's clean up time, the disk content is finished and final */
 
 clean_and_exit:
+	swupd_curl_cleanup();
+	free_subscriptions();
+	free_manifest(official_manifest);
+	v_lockfile(lock_fd);
+	dump_file_descriptor_leaks();
+	free_globals();
+
 	if (ret == EXIT_SUCCESS) {
 		if (cmdline_option_fix || cmdline_option_install) {
 			printf("Fix successful\n");
@@ -806,12 +813,6 @@ int verify_main(int argc, char **argv)
 			printf("Error: Verify did not fully succeed\n");
 		}
 	}
-	swupd_curl_cleanup();
-	free_subscriptions();
-	free_manifest(official_manifest);
 
-	v_lockfile(lock_fd);
-	dump_file_descriptor_leaks();
-	free_globals();
 	return ret;
 }