From 68e09aaa55a38cdcf5b3b7b70feaa588dcc02895 Mon Sep 17 00:00:00 2001 From: William Douglas Date: Thu, 24 Apr 2025 08:31:06 -0700 Subject: [PATCH 1/3] Update copyright years Signed-off-by: William Douglas --- continous.sh | 2 +- docker/Dockerfile | 2 +- docker/dockerrun.sh | 2 +- docs/swupd-alias.7.rst.in | 2 +- docs/swupd-update.service.4.rst | 2 +- docs/swupd-update.timer.4.rst | 2 +- docs/swupd.1.rst | 2 +- docs/update-triggers.target.4.rst | 2 +- src/3rd_party/3rd_party.c | 2 +- src/3rd_party/3rd_party_add.c | 2 +- src/3rd_party/3rd_party_bundle_add.c | 2 +- src/3rd_party/3rd_party_bundle_info.c | 2 +- src/3rd_party/3rd_party_bundle_list.c | 2 +- src/3rd_party/3rd_party_bundle_remove.c | 2 +- src/3rd_party/3rd_party_check_update.c | 2 +- src/3rd_party/3rd_party_clean.c | 2 +- src/3rd_party/3rd_party_diagnose.c | 2 +- src/3rd_party/3rd_party_info.c | 2 +- src/3rd_party/3rd_party_list.c | 2 +- src/3rd_party/3rd_party_remove.c | 2 +- src/3rd_party/3rd_party_repair.c | 2 +- src/3rd_party/3rd_party_repos.c | 2 +- src/3rd_party/3rd_party_update.c | 2 +- src/cmds/autoupdate.c | 2 +- src/cmds/bundle_add.c | 2 +- src/cmds/bundle_info.c | 2 +- src/cmds/bundle_list.c | 2 +- src/cmds/bundle_remove.c | 2 +- src/cmds/check_update.c | 2 +- src/cmds/clean.c | 2 +- src/cmds/info.c | 2 +- src/cmds/os_install.c | 2 +- src/cmds/repair.c | 2 +- src/cmds/update.c | 2 +- src/cmds/verify.c | 2 +- src/lib/archives.c | 2 +- src/lib/comp_functions.c | 2 +- src/lib/config_file.c | 2 +- src/lib/formatter_json.c | 2 +- src/lib/hashmap.c | 2 +- src/lib/list.c | 2 +- src/lib/log.c | 2 +- src/lib/strings.c | 2 +- src/lib/sys.c | 2 +- src/lib/thread_pool.c | 2 +- src/lib/timelist.c | 2 +- src/main.c | 4 ++-- src/swupd_build_opts.h | 2 +- src/swupd_lib/alias.c | 2 +- src/swupd_lib/binary_loader.c | 2 +- src/swupd_lib/bundle.c | 2 +- src/swupd_lib/config_loader.c | 2 +- src/swupd_lib/curl.c | 2 +- src/swupd_lib/curl_async.c | 2 +- src/swupd_lib/delta.c | 2 +- src/swupd_lib/extra_files.c | 2 +- src/swupd_lib/filedesc.c | 2 +- src/swupd_lib/fullfile.c | 2 +- src/swupd_lib/globals.c | 2 +- src/swupd_lib/hash.c | 2 +- src/swupd_lib/hashdump.c | 2 +- src/swupd_lib/helpers.c | 2 +- src/swupd_lib/heuristics.c | 2 +- src/swupd_lib/lock.c | 2 +- src/swupd_lib/manifest.c | 2 +- src/swupd_lib/manifest_parser.c | 2 +- src/swupd_lib/mirror.c | 2 +- src/swupd_lib/packs.c | 2 +- src/swupd_lib/progress.c | 2 +- src/swupd_lib/scripts.c | 2 +- src/swupd_lib/search_file.c | 2 +- src/swupd_lib/signature.c | 2 +- src/swupd_lib/statedir.c | 2 +- src/swupd_lib/stats.c | 2 +- src/swupd_lib/subscriptions.c | 2 +- src/swupd_lib/swupd_comp_functions.c | 2 +- src/swupd_lib/swupd_progress.c | 2 +- src/swupd_lib/target_root.c | 2 +- src/swupd_lib/telemetry.c | 2 +- src/swupd_lib/version.c | 2 +- src/swupd_lib/xattrs.c | 2 +- src/verifytime/verifytime.c | 2 +- src/verifytime/verifytime_main.c | 2 +- swupd.bash | 2 +- test/unit/test_heuristics.c | 2 +- test/unit/test_list.c | 2 +- test/unit/test_manifest.c | 2 +- test/unit/test_signature.c | 2 +- test/unit/test_strings.c | 2 +- test/unit/test_sys.c | 2 +- 90 files changed, 91 insertions(+), 91 deletions(-) diff --git a/continous.sh b/continous.sh index f76825221..ef3855f75 100755 --- a/continous.sh +++ b/continous.sh @@ -2,7 +2,7 @@ # # This file is part of swupd-client. # -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2025 Intel Corporation # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/docker/Dockerfile b/docker/Dockerfile index f9bd7e880..538c56506 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ # # This file is part of swupd-client. # -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2025 Intel Corporation # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/docker/dockerrun.sh b/docker/dockerrun.sh index 9a4f9bfc4..59753412a 100755 --- a/docker/dockerrun.sh +++ b/docker/dockerrun.sh @@ -2,7 +2,7 @@ # # This file is part of swupd-client. # -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2025 Intel Corporation # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/docs/swupd-alias.7.rst.in b/docs/swupd-alias.7.rst.in index 106f896a8..3f2b07999 100644 --- a/docs/swupd-alias.7.rst.in +++ b/docs/swupd-alias.7.rst.in @@ -6,7 +6,7 @@ swupd-alias Alias Names for Bundles Configuration ------------------------------------- -:Copyright: \(C) 2018 Intel Corporation, CC-BY-SA-3.0 +:Copyright: \(C) 2018-2025 Intel Corporation, CC-BY-SA-3.0 :Manual section: 7 diff --git a/docs/swupd-update.service.4.rst b/docs/swupd-update.service.4.rst index 9d48e9c16..21be15a76 100644 --- a/docs/swupd-update.service.4.rst +++ b/docs/swupd-update.service.4.rst @@ -6,7 +6,7 @@ swupd-update.service Performs an OS update --------------------- -:Copyright: \(C) 2017 Intel Corporation, CC-BY-SA-3.0 +:Copyright: \(C) 2017-2025 Intel Corporation, CC-BY-SA-3.0 :Manual section: 4 diff --git a/docs/swupd-update.timer.4.rst b/docs/swupd-update.timer.4.rst index a7254b074..0ef2f58fa 100644 --- a/docs/swupd-update.timer.4.rst +++ b/docs/swupd-update.timer.4.rst @@ -6,7 +6,7 @@ swupd-update.timer Schedules periodical updates ---------------------------- -:Copyright: \(C) 2017 Intel Corporation, CC-BY-SA-3.0 +:Copyright: \(C) 2017-2025 Intel Corporation, CC-BY-SA-3.0 :Manual section: 4 diff --git a/docs/swupd.1.rst b/docs/swupd.1.rst index 7c8a4fdfd..5ea69c8c6 100644 --- a/docs/swupd.1.rst +++ b/docs/swupd.1.rst @@ -6,7 +6,7 @@ swupd OS software update program -------------------------- -:Copyright: \(C) 2020 Intel Corporation, CC-BY-SA-3.0 +:Copyright: \(C) 2020-2025 Intel Corporation, CC-BY-SA-3.0 :Manual section: 1 diff --git a/docs/update-triggers.target.4.rst b/docs/update-triggers.target.4.rst index 68b047bb0..a7f4fc420 100644 --- a/docs/update-triggers.target.4.rst +++ b/docs/update-triggers.target.4.rst @@ -6,7 +6,7 @@ update-triggers.target Provides post OS software-update actions ---------------------------------------- -:Copyright: \(C) 2017 Intel Corporation, CC-BY-SA-3.0 +:Copyright: \(C) 2017-2025 Intel Corporation, CC-BY-SA-3.0 :Manual section: 4 diff --git a/src/3rd_party/3rd_party.c b/src/3rd_party/3rd_party.c index 9ca075753..35b248c29 100644 --- a/src/3rd_party/3rd_party.c +++ b/src/3rd_party/3rd_party.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_add.c b/src/3rd_party/3rd_party_add.c index f5686be12..aeacbfefa 100644 --- a/src/3rd_party/3rd_party_add.c +++ b/src/3rd_party/3rd_party_add.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_bundle_add.c b/src/3rd_party/3rd_party_bundle_add.c index 33ae3d0f2..72b4481fe 100644 --- a/src/3rd_party/3rd_party_bundle_add.c +++ b/src/3rd_party/3rd_party_bundle_add.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_bundle_info.c b/src/3rd_party/3rd_party_bundle_info.c index f3d0a586a..73ca17132 100644 --- a/src/3rd_party/3rd_party_bundle_info.c +++ b/src/3rd_party/3rd_party_bundle_info.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_bundle_list.c b/src/3rd_party/3rd_party_bundle_list.c index 74f9e5ca8..9c292ecd8 100644 --- a/src/3rd_party/3rd_party_bundle_list.c +++ b/src/3rd_party/3rd_party_bundle_list.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_bundle_remove.c b/src/3rd_party/3rd_party_bundle_remove.c index 4107f7ff1..d9260b69b 100644 --- a/src/3rd_party/3rd_party_bundle_remove.c +++ b/src/3rd_party/3rd_party_bundle_remove.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_check_update.c b/src/3rd_party/3rd_party_check_update.c index 8f476fd0b..b8a98622d 100644 --- a/src/3rd_party/3rd_party_check_update.c +++ b/src/3rd_party/3rd_party_check_update.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_clean.c b/src/3rd_party/3rd_party_clean.c index 1b8ba901e..af3e2b8fc 100644 --- a/src/3rd_party/3rd_party_clean.c +++ b/src/3rd_party/3rd_party_clean.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_diagnose.c b/src/3rd_party/3rd_party_diagnose.c index ac448835d..c5ffd89a3 100644 --- a/src/3rd_party/3rd_party_diagnose.c +++ b/src/3rd_party/3rd_party_diagnose.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_info.c b/src/3rd_party/3rd_party_info.c index ad76281e9..4e6c81ebc 100644 --- a/src/3rd_party/3rd_party_info.c +++ b/src/3rd_party/3rd_party_info.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2020 Intel Corporation. + * Copyright © 2020-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_list.c b/src/3rd_party/3rd_party_list.c index b8269b6cb..63fae2fae 100644 --- a/src/3rd_party/3rd_party_list.c +++ b/src/3rd_party/3rd_party_list.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_remove.c b/src/3rd_party/3rd_party_remove.c index 93f703c55..2d37af42a 100644 --- a/src/3rd_party/3rd_party_remove.c +++ b/src/3rd_party/3rd_party_remove.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_repair.c b/src/3rd_party/3rd_party_repair.c index 5e734fea0..e85b97c2e 100644 --- a/src/3rd_party/3rd_party_repair.c +++ b/src/3rd_party/3rd_party_repair.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_repos.c b/src/3rd_party/3rd_party_repos.c index 8679c7897..d995b43bf 100644 --- a/src/3rd_party/3rd_party_repos.c +++ b/src/3rd_party/3rd_party_repos.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/3rd_party/3rd_party_update.c b/src/3rd_party/3rd_party_update.c index 43defcdd2..ab69b5b26 100644 --- a/src/3rd_party/3rd_party_update.c +++ b/src/3rd_party/3rd_party_update.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/autoupdate.c b/src/cmds/autoupdate.c index fb029e9ea..3baf8374f 100644 --- a/src/cmds/autoupdate.c +++ b/src/cmds/autoupdate.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2012-2020 Intel Corporation. + * Copyright (c) 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/bundle_add.c b/src/cmds/bundle_add.c index dc3564ea0..6d0ad1aa0 100644 --- a/src/cmds/bundle_add.c +++ b/src/cmds/bundle_add.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2012-2020 Intel Corporation. + * Copyright (c) 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/bundle_info.c b/src/cmds/bundle_info.c index 9af87eb38..d0ca24e16 100644 --- a/src/cmds/bundle_info.c +++ b/src/cmds/bundle_info.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/bundle_list.c b/src/cmds/bundle_list.c index 5a8461b84..3995b9a4b 100644 --- a/src/cmds/bundle_list.c +++ b/src/cmds/bundle_list.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/bundle_remove.c b/src/cmds/bundle_remove.c index f11c4d69d..428b82092 100644 --- a/src/cmds/bundle_remove.c +++ b/src/cmds/bundle_remove.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2012-2020 Intel Corporation. + * Copyright (c) 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/check_update.c b/src/cmds/check_update.c index e2289219a..9522cb623 100644 --- a/src/cmds/check_update.c +++ b/src/cmds/check_update.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/clean.c b/src/cmds/clean.c index b00aae265..3e869ae33 100644 --- a/src/cmds/clean.c +++ b/src/cmds/clean.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2018-2020 Intel Corporation. + * Copyright © 2018-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/info.c b/src/cmds/info.c index 00e6e22aa..0a6509a47 100644 --- a/src/cmds/info.c +++ b/src/cmds/info.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2018-2020 Intel Corporation. + * Copyright © 2018-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/os_install.c b/src/cmds/os_install.c index 1dcee6b7b..19cdae11e 100644 --- a/src/cmds/os_install.c +++ b/src/cmds/os_install.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/repair.c b/src/cmds/repair.c index 031c6418e..6e7a7ba98 100644 --- a/src/cmds/repair.c +++ b/src/cmds/repair.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/update.c b/src/cmds/update.c index 7505bc3f0..f1369d952 100644 --- a/src/cmds/update.c +++ b/src/cmds/update.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cmds/verify.c b/src/cmds/verify.c index 9b2852e78..c976bc7d9 100644 --- a/src/cmds/verify.c +++ b/src/cmds/verify.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/archives.c b/src/lib/archives.c index c7e59c458..19da9343c 100644 --- a/src/lib/archives.c +++ b/src/lib/archives.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2017-2020 Intel Corporation. + * Copyright © 2017-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/comp_functions.c b/src/lib/comp_functions.c index 4a13881a5..876f6ee5b 100644 --- a/src/lib/comp_functions.c +++ b/src/lib/comp_functions.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/config_file.c b/src/lib/config_file.c index bb72ecabd..224ebf8de 100644 --- a/src/lib/config_file.c +++ b/src/lib/config_file.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/formatter_json.c b/src/lib/formatter_json.c index 002d1016d..8ddb30866 100644 --- a/src/lib/formatter_json.c +++ b/src/lib/formatter_json.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/hashmap.c b/src/lib/hashmap.c index 01476361e..70213b108 100644 --- a/src/lib/hashmap.c +++ b/src/lib/hashmap.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/list.c b/src/lib/list.c index 0fc8ef305..f0af0c13a 100644 --- a/src/lib/list.c +++ b/src/lib/list.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/log.c b/src/lib/log.c index 048a4e4dc..c2fb50df4 100644 --- a/src/lib/log.c +++ b/src/lib/log.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/strings.c b/src/lib/strings.c index 1aef47d47..6faab83ca 100644 --- a/src/lib/strings.c +++ b/src/lib/strings.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/sys.c b/src/lib/sys.c index ab34ea963..0753e1c4c 100644 --- a/src/lib/sys.c +++ b/src/lib/sys.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2012-2020 Intel Corporation. + * Copyright (c) 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/thread_pool.c b/src/lib/thread_pool.c index c3ca363bf..766963344 100644 --- a/src/lib/thread_pool.c +++ b/src/lib/thread_pool.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2018-2020 Intel Corporation. + * Copyright © 2018-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lib/timelist.c b/src/lib/timelist.c index caec32ae1..328622b14 100644 --- a/src/lib/timelist.c +++ b/src/lib/timelist.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2018-2020 Intel Corporation. + * Copyright © 2018-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main.c b/src/main.c index 39201f5bb..8a486b31e 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2015-2020 Intel Corporation. + * Copyright © 2015-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -100,7 +100,7 @@ static void print_help(const char *name) static void copyright_header(void) { print(PACKAGE " " VERSION "\n"); - print(" Copyright (C) 2012-2019 Intel Corporation\n"); + print(" Copyright (C) 2012-2025 Intel Corporation\n"); print("\n"); } diff --git a/src/swupd_build_opts.h b/src/swupd_build_opts.h index 798bc3cea..d793582ce 100644 --- a/src/swupd_build_opts.h +++ b/src/swupd_build_opts.h @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2016 Intel Corporation. + * Copyright © 2016-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/alias.c b/src/swupd_lib/alias.c index 3930bdbad..2cb55fad6 100644 --- a/src/swupd_lib/alias.c +++ b/src/swupd_lib/alias.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2018-2020 Intel Corporation. + * Copyright (c) 2018-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/binary_loader.c b/src/swupd_lib/binary_loader.c index 969441265..56bcc467e 100644 --- a/src/swupd_lib/binary_loader.c +++ b/src/swupd_lib/binary_loader.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2019-2020 Intel Corporation. + * Copyright © 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/bundle.c b/src/swupd_lib/bundle.c index a661e04bd..98d4898dd 100644 --- a/src/swupd_lib/bundle.c +++ b/src/swupd_lib/bundle.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2012-2020 Intel Corporation. + * Copyright (c) 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/config_loader.c b/src/swupd_lib/config_loader.c index ab0e38559..f2554d765 100644 --- a/src/swupd_lib/config_loader.c +++ b/src/swupd_lib/config_loader.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/curl.c b/src/swupd_lib/curl.c index 840ebbc98..4d5421f5e 100644 --- a/src/swupd_lib/curl.c +++ b/src/swupd_lib/curl.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/curl_async.c b/src/swupd_lib/curl_async.c index 92d64e311..a3218b1a3 100644 --- a/src/swupd_lib/curl_async.c +++ b/src/swupd_lib/curl_async.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/delta.c b/src/swupd_lib/delta.c index 2fbccffe0..75ab90f54 100644 --- a/src/swupd_lib/delta.c +++ b/src/swupd_lib/delta.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/extra_files.c b/src/swupd_lib/extra_files.c index 10a3dc00a..d6e64c600 100644 --- a/src/swupd_lib/extra_files.c +++ b/src/swupd_lib/extra_files.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/filedesc.c b/src/swupd_lib/filedesc.c index b74b57a06..1b6f9ff59 100644 --- a/src/swupd_lib/filedesc.c +++ b/src/swupd_lib/filedesc.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/fullfile.c b/src/swupd_lib/fullfile.c index 22def738f..5b0eb3592 100644 --- a/src/swupd_lib/fullfile.c +++ b/src/swupd_lib/fullfile.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/globals.c b/src/swupd_lib/globals.c index 2db635107..135f04f9a 100644 --- a/src/swupd_lib/globals.c +++ b/src/swupd_lib/globals.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2014-2020 Intel Corporation. + * Copyright © 2014-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/hash.c b/src/swupd_lib/hash.c index 19f802627..3e7d9bcd3 100644 --- a/src/swupd_lib/hash.c +++ b/src/swupd_lib/hash.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/hashdump.c b/src/swupd_lib/hashdump.c index 6988e84da..b6e262554 100644 --- a/src/swupd_lib/hashdump.c +++ b/src/swupd_lib/hashdump.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2013-2020 Intel Corporation. + * Copyright © 2013-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/helpers.c b/src/swupd_lib/helpers.c index 97a6ff27c..c9ecddfdf 100644 --- a/src/swupd_lib/helpers.c +++ b/src/swupd_lib/helpers.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/heuristics.c b/src/swupd_lib/heuristics.c index 4c0f914f5..3bfbf9289 100644 --- a/src/swupd_lib/heuristics.c +++ b/src/swupd_lib/heuristics.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/lock.c b/src/swupd_lib/lock.c index 154d5194c..b465e85b3 100644 --- a/src/swupd_lib/lock.c +++ b/src/swupd_lib/lock.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2016-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/manifest.c b/src/swupd_lib/manifest.c index 092fd4086..c253409aa 100644 --- a/src/swupd_lib/manifest.c +++ b/src/swupd_lib/manifest.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/manifest_parser.c b/src/swupd_lib/manifest_parser.c index da0733a4d..ae406c8e4 100644 --- a/src/swupd_lib/manifest_parser.c +++ b/src/swupd_lib/manifest_parser.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/mirror.c b/src/swupd_lib/mirror.c index 31a9df7de..e485a0f2a 100644 --- a/src/swupd_lib/mirror.c +++ b/src/swupd_lib/mirror.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2018-2020 Intel Corporation. + * Copyright © 2018-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/packs.c b/src/swupd_lib/packs.c index 4455c10d2..47345d64a 100644 --- a/src/swupd_lib/packs.c +++ b/src/swupd_lib/packs.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/progress.c b/src/swupd_lib/progress.c index 49d2d843e..b22cc7111 100644 --- a/src/swupd_lib/progress.c +++ b/src/swupd_lib/progress.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/scripts.c b/src/swupd_lib/scripts.c index c05756d50..db0ce24e7 100644 --- a/src/swupd_lib/scripts.c +++ b/src/swupd_lib/scripts.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/search_file.c b/src/swupd_lib/search_file.c index bfa8cb88a..c6ec45130 100644 --- a/src/swupd_lib/search_file.c +++ b/src/swupd_lib/search_file.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/signature.c b/src/swupd_lib/signature.c index 7285025b6..6a091d198 100644 --- a/src/swupd_lib/signature.c +++ b/src/swupd_lib/signature.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/statedir.c b/src/swupd_lib/statedir.c index 8387e37c3..7a7083450 100644 --- a/src/swupd_lib/statedir.c +++ b/src/swupd_lib/statedir.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/stats.c b/src/swupd_lib/stats.c index 7f5ff2ad2..9d6862489 100644 --- a/src/swupd_lib/stats.c +++ b/src/swupd_lib/stats.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/subscriptions.c b/src/swupd_lib/subscriptions.c index 986f8ac8e..52739d838 100644 --- a/src/swupd_lib/subscriptions.c +++ b/src/swupd_lib/subscriptions.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/swupd_comp_functions.c b/src/swupd_lib/swupd_comp_functions.c index 5ae7db25a..5b060f0d4 100644 --- a/src/swupd_lib/swupd_comp_functions.c +++ b/src/swupd_lib/swupd_comp_functions.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/swupd_progress.c b/src/swupd_lib/swupd_progress.c index b64d7bc4b..73d4a08c5 100644 --- a/src/swupd_lib/swupd_progress.c +++ b/src/swupd_lib/swupd_progress.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2019 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/target_root.c b/src/swupd_lib/target_root.c index 1cdd132f8..e1bb6f693 100644 --- a/src/swupd_lib/target_root.c +++ b/src/swupd_lib/target_root.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/telemetry.c b/src/swupd_lib/telemetry.c index 2a686ba69..8e4f36dd2 100644 --- a/src/swupd_lib/telemetry.c +++ b/src/swupd_lib/telemetry.c @@ -2,7 +2,7 @@ /* * Software Updater - telemetry collection * - * Copyright © 2016-2020 Intel Corporation. + * Copyright © 2016-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/version.c b/src/swupd_lib/version.c index 6fe7b865d..a14003839 100644 --- a/src/swupd_lib/version.c +++ b/src/swupd_lib/version.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2012-2020 Intel Corporation. + * Copyright © 2012-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/swupd_lib/xattrs.c b/src/swupd_lib/xattrs.c index a73af1a76..cfbbcea37 100644 --- a/src/swupd_lib/xattrs.c +++ b/src/swupd_lib/xattrs.c @@ -3,7 +3,7 @@ * * File Extended Attributes Helpers * - * Copyright © 2014-2020 Intel Corporation. + * Copyright © 2014-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/verifytime/verifytime.c b/src/verifytime/verifytime.c index db7b3d9eb..88f67777c 100644 --- a/src/verifytime/verifytime.c +++ b/src/verifytime/verifytime.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2017-2020 Intel Corporation. + * Copyright © 2017-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/verifytime/verifytime_main.c b/src/verifytime/verifytime_main.c index a9a9322bf..8ccdd8087 100644 --- a/src/verifytime/verifytime_main.c +++ b/src/verifytime/verifytime_main.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright © 2017 Intel Corporation. + * Copyright © 2017-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/swupd.bash b/swupd.bash index 36afaa78b..5f375f119 100644 --- a/swupd.bash +++ b/swupd.bash @@ -1,7 +1,7 @@ #!/bin/bash # Software Updater - autocompletion script # -# Copyright © 2018 Intel Corporation. +# Copyright © 2018-2025 Intel Corporation. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/unit/test_heuristics.c b/test/unit/test_heuristics.c index 74174430f..0accb7278 100644 --- a/test/unit/test_heuristics.c +++ b/test/unit/test_heuristics.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2019-2020 Intel Corporation. + * Copyright (c) 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/test/unit/test_list.c b/test/unit/test_list.c index 390fe2d30..132532c5f 100644 --- a/test/unit/test_list.c +++ b/test/unit/test_list.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2019-2020 Intel Corporation. + * Copyright (c) 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/test/unit/test_manifest.c b/test/unit/test_manifest.c index 960a02b53..23232c221 100644 --- a/test/unit/test_manifest.c +++ b/test/unit/test_manifest.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2019-2020 Intel Corporation. + * Copyright (c) 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/test/unit/test_signature.c b/test/unit/test_signature.c index 1f3a2ec9f..5bf402528 100644 --- a/test/unit/test_signature.c +++ b/test/unit/test_signature.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2019-2020 Intel Corporation. + * Copyright (c) 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/test/unit/test_strings.c b/test/unit/test_strings.c index 10dddc1b4..4263599ac 100644 --- a/test/unit/test_strings.c +++ b/test/unit/test_strings.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2019-2020 Intel Corporation. + * Copyright (c) 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/test/unit/test_sys.c b/test/unit/test_sys.c index bd8d598a0..476ef1398 100644 --- a/test/unit/test_sys.c +++ b/test/unit/test_sys.c @@ -1,7 +1,7 @@ /* * Software Updater - client side * - * Copyright (c) 2019-2020 Intel Corporation. + * Copyright (c) 2019-2025 Intel Corporation. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 741d0bdd3c2432ce4d2c4fa8635dc06f5f08d164 Mon Sep 17 00:00:00 2001 From: William Douglas Date: Thu, 24 Apr 2025 09:19:06 -0700 Subject: [PATCH 2/3] Make check-update --verbose require root In order to get the content needed for check-update with the --verbose option, root is required as data is put into the statedir. Keep the old behavior when verbose isn't passed. This was change was required because of the new latest file handling for --incremental. Signed-off-by: William Douglas --- src/cmds/check_update.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cmds/check_update.c b/src/cmds/check_update.c index 9522cb623..cff89cbe3 100644 --- a/src/cmds/check_update.c +++ b/src/cmds/check_update.c @@ -164,7 +164,11 @@ enum swupd_code check_update_main(int argc, char **argv) return SWUPD_INVALID_OPTION; } - ret = swupd_init(SWUPD_NO_ROOT); + if (log_get_level() >= LOG_INFO_VERBOSE) { + ret = swupd_init(SWUPD_ALL); + } else { + ret = swupd_init(SWUPD_NO_ROOT); + } if (ret != SWUPD_OK) { return ret; } From ab242a7c3ae131b31f58697c8168e787287a7e96 Mon Sep 17 00:00:00 2001 From: William Douglas Date: Thu, 24 Apr 2025 11:12:46 -0700 Subject: [PATCH 3/3] Add format information to update output The current format is very useful information to get from bug reports so add it as default output to swupd update. Signed-off-by: William Douglas --- src/cmds/update.c | 2 +- .../3rd-party/3rd-party-update-basic.bats | 4 ++-- .../3rd-party-update-dangerous-flags.bats | 8 ++++---- ...-party-update-export-template-multi-repo.bats | 4 ++-- .../3rd-party-update-export-template.bats | 6 +++--- .../3rd-party/3rd-party-update-exported-bin.bats | 2 +- .../3rd-party-update-specific-version.bats | 2 +- test/functional/bundlelist/list-orphans.bats | 2 +- test/functional/bundleremove/remove-orphans.bats | 2 +- .../only_in_ci_slow/update-non-responsive.bats | 2 +- .../only_in_ci_slow/update-slow-server.bats | 2 +- .../expired-certificate-latest.bats | 2 +- .../expired-certificate-mom.bats | 2 +- .../only_in_ci_system/update-no-disk-space.bats | 8 ++++---- test/functional/signature/alt-key-rotation.bats | 4 ++-- test/functional/signature/key-rotation.bats | 8 ++++---- test/functional/signature/version-sig-check.bats | 6 +++--- test/functional/update/update-3rd-party.bats | 8 ++++---- test/functional/update/update-attr-change.bats | 2 +- test/functional/update/update-boot-file.bats | 2 +- test/functional/update/update-boot-manager.bats | 2 +- test/functional/update/update-boot-skip.bats | 2 +- .../functional/update/update-bundle-removed.bats | 2 +- .../update/update-deleted-include-manifest.bats | 2 +- test/functional/update/update-download.bats | 2 +- .../update/update-fail-to-get-mom.bats | 4 ++-- .../update/update-ignore-also-add.bats | 2 +- ...ate-include-old-bundle-with-tracked-file.bats | 2 +- .../update/update-include-old-bundle.bats | 2 +- test/functional/update/update-include.bats | 2 +- test/functional/update/update-incremental.bats | 16 ++++++++-------- test/functional/update/update-json.bats | 2 +- .../update/update-manifest-delta-recover.bats | 4 ++-- .../functional/update/update-manifest-delta.bats | 6 +++--- test/functional/update/update-minversion.bats | 2 +- .../update/update-missing-os-core.bats | 2 +- test/functional/update/update-newest-added.bats | 2 +- .../functional/update/update-newest-deleted.bats | 2 +- .../functional/update/update-newest-ghosted.bats | 2 +- .../update/update-re-update-bad-os-release.bats | 2 +- .../update/update-re-update-required.bats | 4 ++-- .../functional/update/update-rename-ghosted.bats | 2 +- test/functional/update/update-rename.bats | 2 +- .../update/update-search-file-index.bats | 4 ++-- test/functional/update/update-skip-scripts.bats | 2 +- .../update/update-skip-verified-fullfiles.bats | 2 +- .../update/update-statedir-bad-hash.bats | 2 +- .../update/update-type-changes-dir-to-file.bats | 2 +- ...e-type-changes-file-to-recursive-symlink.bats | 2 +- .../update-type-changes-file-to-symlink.bats | 2 +- .../update-type-changes-symlink-to-file.bats | 2 +- .../update/update-unusual-file-names.bats | 2 +- test/functional/update/update-use-full-file.bats | 2 +- test/functional/update/update-use-pack.bats | 2 +- .../update-verify-fix-path-hash-mismatch.bats | 2 +- .../update-verify-fix-path-missing-dir.bats | 2 +- .../update/update-verify-fullfile-hash.bats | 2 +- .../update/update-with-mirror-signature.bats | 4 ++-- test/functional/update/update-with-mirror.bats | 2 +- .../update/update-with-old-mirror.bats | 2 +- .../update/update-with-slightly-old-mirror.bats | 2 +- 61 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/cmds/update.c b/src/cmds/update.c index f1369d952..a1c196f64 100644 --- a/src/cmds/update.c +++ b/src/cmds/update.c @@ -337,7 +337,7 @@ enum swupd_code execute_update_extra(extra_proc_fn_t post_update_fn, extra_proc_ goto clean_curl; } - info("Preparing to update from %i to %i\n", current_version, server_version); + info("Preparing to update from %i to %i (in format %s)\n", current_version, server_version, globals.format_string); timelist_timer_stop(globals.global_times); // closing: Get versions /* housekeeping */ diff --git a/test/functional/3rd-party/3rd-party-update-basic.bats b/test/functional/3rd-party/3rd-party-update-basic.bats index 17e708444..7a31d0215 100755 --- a/test/functional/3rd-party/3rd-party-update-basic.bats +++ b/test/functional/3rd-party/3rd-party-update-basic.bats @@ -33,7 +33,7 @@ test_setup() { expected_output=$(cat <<-EOM Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -87,7 +87,7 @@ test_setup() { __________________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats b/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats index 23ca73e19..bb47c55b2 100755 --- a/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats +++ b/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats @@ -51,7 +51,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -93,7 +93,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -133,7 +133,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -167,7 +167,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats b/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats index b05b8ef4b..86b49bee3 100755 --- a/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats +++ b/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats @@ -56,7 +56,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 @@ -152,7 +152,7 @@ test_setup() { expected_output=$(cat <<-EOM Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/3rd-party/3rd-party-update-export-template.bats b/test/functional/3rd-party/3rd-party-update-export-template.bats index 3145d9f4d..4d1390a05 100755 --- a/test/functional/3rd-party/3rd-party-update-export-template.bats +++ b/test/functional/3rd-party/3rd-party-update-export-template.bats @@ -44,7 +44,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 @@ -112,7 +112,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 @@ -186,7 +186,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/3rd-party/3rd-party-update-exported-bin.bats b/test/functional/3rd-party/3rd-party-update-exported-bin.bats index f15f46a31..cd75a980e 100755 --- a/test/functional/3rd-party/3rd-party-update-exported-bin.bats +++ b/test/functional/3rd-party/3rd-party-update-exported-bin.bats @@ -50,7 +50,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle3 - os-core diff --git a/test/functional/3rd-party/3rd-party-update-specific-version.bats b/test/functional/3rd-party/3rd-party-update-specific-version.bats index 4e21c11f8..030ec0dee 100755 --- a/test/functional/3rd-party/3rd-party-update-specific-version.bats +++ b/test/functional/3rd-party/3rd-party-update-specific-version.bats @@ -28,7 +28,7 @@ test_setup() { expected_output=$(cat <<-EOM Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/bundlelist/list-orphans.bats b/test/functional/bundlelist/list-orphans.bats index 330d751c9..621f85cb6 100755 --- a/test/functional/bundlelist/list-orphans.bats +++ b/test/functional/bundlelist/list-orphans.bats @@ -75,7 +75,7 @@ teardown_file() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/bundleremove/remove-orphans.bats b/test/functional/bundleremove/remove-orphans.bats index 10b7165b6..62320b197 100755 --- a/test/functional/bundleremove/remove-orphans.bats +++ b/test/functional/bundleremove/remove-orphans.bats @@ -67,7 +67,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/only_in_ci_slow/update-non-responsive.bats b/test/functional/only_in_ci_slow/update-non-responsive.bats index b611fd9dc..123c26203 100755 --- a/test/functional/only_in_ci_slow/update-non-responsive.bats +++ b/test/functional/only_in_ci_slow/update-non-responsive.bats @@ -112,7 +112,7 @@ test_setup() { Checking mirror status Warning: Upstream server http://localhost:$port/ not responding, cannot determine upstream version Warning: Unable to determine if the mirror is up to date - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/only_in_ci_slow/update-slow-server.bats b/test/functional/only_in_ci_slow/update-slow-server.bats index e89bd1917..d3a8c1996 100755 --- a/test/functional/only_in_ci_slow/update-slow-server.bats +++ b/test/functional/only_in_ci_slow/update-slow-server.bats @@ -31,7 +31,7 @@ test_setup() { Warning: This is an insecure connection The --allow-insecure-http flag was used, be aware that this poses a threat to the system Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 \(in format staging\) Downloading packs for: - test-bundle Error: Curl - File incompletely downloaded - '.*/100/pack-test-bundle-from-10.tar' diff --git a/test/functional/only_in_ci_system/expired-certificate-latest.bats b/test/functional/only_in_ci_system/expired-certificate-latest.bats index 4f47326df..45c144c18 100755 --- a/test/functional/only_in_ci_system/expired-certificate-latest.bats +++ b/test/functional/only_in_ci_system/expired-certificate-latest.bats @@ -67,7 +67,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/only_in_ci_system/expired-certificate-mom.bats b/test/functional/only_in_ci_system/expired-certificate-mom.bats index 27e259673..46ebf4c74 100755 --- a/test/functional/only_in_ci_system/expired-certificate-mom.bats +++ b/test/functional/only_in_ci_system/expired-certificate-mom.bats @@ -68,7 +68,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Warning: Signature check failed Warning: Removing corrupt Manifest.MoM artifacts and re-downloading... Warning: Signature check failed diff --git a/test/functional/only_in_ci_system/update-no-disk-space.bats b/test/functional/only_in_ci_system/update-no-disk-space.bats index 8d7e4c9eb..4000a9070 100755 --- a/test/functional/only_in_ci_system/update-no-disk-space.bats +++ b/test/functional/only_in_ci_system/update-no-disk-space.bats @@ -73,7 +73,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Error: Curl - Error downloading to local file - 'file://$ABS_TEST_DIR/web-dir/20/Manifest.MoM.tar' Error: Curl - Check free space for $ABS_TEST_DIR/testfs/state? Error: Failed to retrieve 20 MoM manifest @@ -103,7 +103,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Error: Curl - Error downloading to local file - 'file://$ABS_TEST_DIR/web-dir/10/Manifest.test-bundle.tar' Error: Curl - Check free space for $ABS_TEST_DIR/testfs/state? Error: Failed to retrieve 10 test-bundle manifest @@ -134,7 +134,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Error: Curl - Error downloading to local file - 'file://$ABS_TEST_DIR/web-dir/20/Manifest.test-bundle.tar' Error: Curl - Check free space for $ABS_TEST_DIR/testfs/state? Error: Failed to retrieve 20 test-bundle manifest @@ -158,7 +158,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_DOWNLOAD_FILE" expected_output1=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Downloading packs \\(20.*\\) for: EOM ) diff --git a/test/functional/signature/alt-key-rotation.bats b/test/functional/signature/alt-key-rotation.bats index fd8406a07..f5f490bde 100755 --- a/test/functional/signature/alt-key-rotation.bats +++ b/test/functional/signature/alt-key-rotation.bats @@ -50,7 +50,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -78,7 +78,7 @@ test_setup() { expected_output=$(cat <<-EOM Update started Warning: Default cert failed, attempting to use alternative: .*alt - Preparing to update from 40 to 50 + Preparing to update from 40 to 50 \(in format 2\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/signature/key-rotation.bats b/test/functional/signature/key-rotation.bats index 72c59d7a6..143bc07a9 100755 --- a/test/functional/signature/key-rotation.bats +++ b/test/functional/signature/key-rotation.bats @@ -56,7 +56,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -83,7 +83,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 40 to 50 + Preparing to update from 40 to 50 (in format 2) Downloading packs for: - os-core Finishing packs extraction... @@ -117,7 +117,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -144,7 +144,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 40 to 50 + Preparing to update from 40 to 50 (in format 2) Warning: Signature check failed Warning: Removing corrupt Manifest.MoM artifacts and re-downloading... Warning: Signature check failed diff --git a/test/functional/signature/version-sig-check.bats b/test/functional/signature/version-sig-check.bats index 586ebfde2..a5d492ec9 100755 --- a/test/functional/signature/version-sig-check.bats +++ b/test/functional/signature/version-sig-check.bats @@ -75,7 +75,7 @@ test_setup() { Update started Warning: The --nosigcheck flag was used and this compromises the system security Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/version/formatstaging/latest WILL NOT BE VERIFIED - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/10/Manifest.MoM WILL NOT BE VERIFIED Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/20/Manifest.MoM WILL NOT BE VERIFIED Downloading packs for: @@ -113,7 +113,7 @@ test_setup() { Update started Warning: The --nosigcheck-latest flag was used and this compromises the system security Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/version/formatstaging/latest WILL NOT BE VERIFIED - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -150,7 +150,7 @@ test_setup() { Update started Warning: The --nosigcheck-latest flag was used and this compromises the system security Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/version/formatstaging/latest WILL NOT BE VERIFIED - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Warning: Signature check failed Warning: Removing corrupt Manifest.MoM artifacts and re-downloading... Warning: Signature check failed diff --git a/test/functional/update/update-3rd-party.bats b/test/functional/update/update-3rd-party.bats index a56ef963c..d56ba6985 100755 --- a/test/functional/update/update-3rd-party.bats +++ b/test/functional/update/update-3rd-party.bats @@ -31,7 +31,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - upstream-bundle Finishing packs extraction... @@ -54,7 +54,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -149,7 +149,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - upstream-bundle Finishing packs extraction... @@ -173,7 +173,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-attr-change.bats b/test/functional/update/update-attr-change.bats index b69ef6263..cc5ffd202 100755 --- a/test/functional/update/update-attr-change.bats +++ b/test/functional/update/update-attr-change.bats @@ -71,7 +71,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-boot-file.bats b/test/functional/update/update-boot-file.bats index 184ea3ad1..2e87c4ea9 100755 --- a/test/functional/update/update-boot-file.bats +++ b/test/functional/update/update-boot-file.bats @@ -16,7 +16,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-boot-manager.bats b/test/functional/update/update-boot-manager.bats index c60353abf..a05b48e7b 100755 --- a/test/functional/update/update-boot-manager.bats +++ b/test/functional/update/update-boot-manager.bats @@ -35,7 +35,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/update/update-boot-skip.bats b/test/functional/update/update-boot-skip.bats index e591334cc..7e68a56a5 100755 --- a/test/functional/update/update-boot-skip.bats +++ b/test/functional/update/update-boot-skip.bats @@ -17,7 +17,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-bundle-removed.bats b/test/functional/update/update-bundle-removed.bats index 168234ab7..0f7bf9a25 100755 --- a/test/functional/update/update-bundle-removed.bats +++ b/test/functional/update/update-bundle-removed.bats @@ -24,7 +24,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-deleted-include-manifest.bats b/test/functional/update/update-deleted-include-manifest.bats index 7281decea..3f8598d0d 100755 --- a/test/functional/update/update-deleted-include-manifest.bats +++ b/test/functional/update/update-deleted-include-manifest.bats @@ -28,7 +28,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Error: Failed to retrieve 10 test-bundle2 manifest Error: Unable to download manifest test-bundle2 version 10, exiting now Update failed diff --git a/test/functional/update/update-download.bats b/test/functional/update/update-download.bats index b334df9b9..81f3c9625 100755 --- a/test/functional/update/update-download.bats +++ b/test/functional/update/update-download.bats @@ -17,7 +17,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-fail-to-get-mom.bats b/test/functional/update/update-fail-to-get-mom.bats index a4a548fed..6d42393e2 100755 --- a/test/functional/update/update-fail-to-get-mom.bats +++ b/test/functional/update/update-fail-to-get-mom.bats @@ -19,7 +19,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Error: Failed to retrieve 10 MoM manifest Update failed EOM @@ -38,7 +38,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Error: Failed to retrieve 20 MoM manifest Update failed EOM diff --git a/test/functional/update/update-ignore-also-add.bats b/test/functional/update/update-ignore-also-add.bats index 8eeaa05d5..5cdd6ecd7 100755 --- a/test/functional/update/update-ignore-also-add.bats +++ b/test/functional/update/update-ignore-also-add.bats @@ -29,7 +29,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-include-old-bundle-with-tracked-file.bats b/test/functional/update/update-include-old-bundle-with-tracked-file.bats index c183a607d..edb4d9c5e 100755 --- a/test/functional/update/update-include-old-bundle-with-tracked-file.bats +++ b/test/functional/update/update-include-old-bundle-with-tracked-file.bats @@ -24,7 +24,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format staging) Downloading packs for: - test-bundle1 - os-core diff --git a/test/functional/update/update-include-old-bundle.bats b/test/functional/update/update-include-old-bundle.bats index e5b772304..137ae2cbb 100755 --- a/test/functional/update/update-include-old-bundle.bats +++ b/test/functional/update/update-include-old-bundle.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle2 - test-bundle1 diff --git a/test/functional/update/update-include.bats b/test/functional/update/update-include.bats index a85c61605..1bb582695 100755 --- a/test/functional/update/update-include.bats +++ b/test/functional/update/update-include.bats @@ -40,7 +40,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle6 - test-bundle5 diff --git a/test/functional/update/update-incremental.bats b/test/functional/update/update-incremental.bats index 938212b5e..27ea618a8 100755 --- a/test/functional/update/update-incremental.bats +++ b/test/functional/update/update-incremental.bats @@ -29,7 +29,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -65,7 +65,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -83,7 +83,7 @@ test_teardown() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -120,7 +120,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -138,7 +138,7 @@ test_teardown() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -177,7 +177,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -195,7 +195,7 @@ test_teardown() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -238,7 +238,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 50 + Preparing to update from 10 to 50 (in format 1) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-json.bats b/test/functional/update/update-json.bats index 1ac328940..23a458e96 100755 --- a/test/functional/update/update-json.bats +++ b/test/functional/update/update-json.bats @@ -30,7 +30,7 @@ test_setup() { { "type" : "start", "section" : "update" }, { "type" : "progress", "currentStep" : 1, "totalSteps" : 10, "stepCompletion" : -1, "stepDescription" : "load_manifests" }, { "type" : "info", "msg" : "Update started" }, - { "type" : "info", "msg" : "Preparing to update from 10 to 20" }, + { "type" : "info", "msg" : "Preparing to update from 10 to 20 (in format staging)" }, { "type" : "progress", "currentStep" : 1, "totalSteps" : 10, "stepCompletion" : 100, "stepDescription" : "load_manifests" }, { "type" : "progress", "currentStep" : 2, "totalSteps" : 10, "stepCompletion" : -1, "stepDescription" : "run_preupdate_scripts" }, { "type" : "progress", "currentStep" : 2, "totalSteps" : 10, "stepCompletion" : 100, "stepDescription" : "run_preupdate_scripts" }, diff --git a/test/functional/update/update-manifest-delta-recover.bats b/test/functional/update/update-manifest-delta-recover.bats index f0481a084..c93fabd4d 100755 --- a/test/functional/update/update-manifest-delta-recover.bats +++ b/test/functional/update/update-manifest-delta-recover.bats @@ -29,7 +29,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -61,7 +61,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Warning: hash check failed for Manifest.test-bundle1 for version 30. Deleting it Warning: Removing corrupt Manifest.test-bundle1 artifacts and re-downloading... Downloading packs for: diff --git a/test/functional/update/update-manifest-delta.bats b/test/functional/update/update-manifest-delta.bats index 77e24fbc3..84042331f 100755 --- a/test/functional/update/update-manifest-delta.bats +++ b/test/functional/update/update-manifest-delta.bats @@ -35,7 +35,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -68,7 +68,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Downloading packs for: - test-bundle1 - test-bundle2 @@ -104,7 +104,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Error: Failed to retrieve 30 test-bundle2 manifest Error: Unable to download manifest test-bundle2 version 30, exiting now Update failed diff --git a/test/functional/update/update-minversion.bats b/test/functional/update/update-minversion.bats index e75c0aeb3..a362b5a87 100755 --- a/test/functional/update/update-minversion.bats +++ b/test/functional/update/update-minversion.bats @@ -20,7 +20,7 @@ test_setup() { expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - bundle1 - os-core diff --git a/test/functional/update/update-missing-os-core.bats b/test/functional/update/update-missing-os-core.bats index 5fd3826b7..6713325cc 100755 --- a/test/functional/update/update-missing-os-core.bats +++ b/test/functional/update/update-missing-os-core.bats @@ -20,7 +20,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core - test-bundle diff --git a/test/functional/update/update-newest-added.bats b/test/functional/update/update-newest-added.bats index ef836beab..2de277c0f 100755 --- a/test/functional/update/update-newest-added.bats +++ b/test/functional/update/update-newest-added.bats @@ -21,7 +21,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-newest-deleted.bats b/test/functional/update/update-newest-deleted.bats index 1b8943835..68f4c84ab 100755 --- a/test/functional/update/update-newest-deleted.bats +++ b/test/functional/update/update-newest-deleted.bats @@ -30,7 +30,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/update/update-newest-ghosted.bats b/test/functional/update/update-newest-ghosted.bats index cb1bb129a..f925c90eb 100755 --- a/test/functional/update/update-newest-ghosted.bats +++ b/test/functional/update/update-newest-ghosted.bats @@ -18,7 +18,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-re-update-bad-os-release.bats b/test/functional/update/update-re-update-bad-os-release.bats index 6835cb610..0755c98bb 100755 --- a/test/functional/update/update-re-update-bad-os-release.bats +++ b/test/functional/update/update-re-update-bad-os-release.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is "$SWUPD_CURRENT_VERSION_UNKNOWN" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-re-update-required.bats b/test/functional/update/update-re-update-required.bats index 706b0d88a..b996911ee 100755 --- a/test/functional/update/update-re-update-required.bats +++ b/test/functional/update/update-re-update-required.bats @@ -17,7 +17,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -35,7 +35,7 @@ test_setup() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 30 to 40 + Preparing to update from 30 to 40 (in format 2) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-rename-ghosted.bats b/test/functional/update/update-rename-ghosted.bats index f534eaff4..3afbfed72 100755 --- a/test/functional/update/update-rename-ghosted.bats +++ b/test/functional/update/update-rename-ghosted.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-rename.bats b/test/functional/update/update-rename.bats index b10cd16f7..60af6459c 100755 --- a/test/functional/update/update-rename.bats +++ b/test/functional/update/update-rename.bats @@ -21,7 +21,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-search-file-index.bats b/test/functional/update/update-search-file-index.bats index 0ef75612c..2d70ab7ea 100755 --- a/test/functional/update/update-search-file-index.bats +++ b/test/functional/update/update-search-file-index.bats @@ -18,7 +18,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... @@ -49,7 +49,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 \(in format staging\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-skip-scripts.bats b/test/functional/update/update-skip-scripts.bats index 4d36fa956..764cecf10 100755 --- a/test/functional/update/update-skip-scripts.bats +++ b/test/functional/update/update-skip-scripts.bats @@ -19,7 +19,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-skip-verified-fullfiles.bats b/test/functional/update/update-skip-verified-fullfiles.bats index 5a46713f8..65c08cf8f 100755 --- a/test/functional/update/update-skip-verified-fullfiles.bats +++ b/test/functional/update/update-skip-verified-fullfiles.bats @@ -27,7 +27,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-statedir-bad-hash.bats b/test/functional/update/update-statedir-bad-hash.bats index c7f126595..7b497434f 100755 --- a/test/functional/update/update-statedir-bad-hash.bats +++ b/test/functional/update/update-statedir-bad-hash.bats @@ -21,7 +21,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-type-changes-dir-to-file.bats b/test/functional/update/update-type-changes-dir-to-file.bats index 25d7c0fb7..bbebf0600 100755 --- a/test/functional/update/update-type-changes-dir-to-file.bats +++ b/test/functional/update/update-type-changes-dir-to-file.bats @@ -52,7 +52,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-type-changes-file-to-recursive-symlink.bats b/test/functional/update/update-type-changes-file-to-recursive-symlink.bats index bd7fe2dc1..7e8ce1e7f 100755 --- a/test/functional/update/update-type-changes-file-to-recursive-symlink.bats +++ b/test/functional/update/update-type-changes-file-to-recursive-symlink.bats @@ -60,7 +60,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/update/update-type-changes-file-to-symlink.bats b/test/functional/update/update-type-changes-file-to-symlink.bats index 97e978085..530542466 100755 --- a/test/functional/update/update-type-changes-file-to-symlink.bats +++ b/test/functional/update/update-type-changes-file-to-symlink.bats @@ -53,7 +53,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-type-changes-symlink-to-file.bats b/test/functional/update/update-type-changes-symlink-to-file.bats index 232d496e3..d5b5041fe 100755 --- a/test/functional/update/update-type-changes-symlink-to-file.bats +++ b/test/functional/update/update-type-changes-symlink-to-file.bats @@ -65,7 +65,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-unusual-file-names.bats b/test/functional/update/update-unusual-file-names.bats index 8c13eee2b..24e7cc5f2 100755 --- a/test/functional/update/update-unusual-file-names.bats +++ b/test/functional/update/update-unusual-file-names.bats @@ -39,7 +39,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 - os-core diff --git a/test/functional/update/update-use-full-file.bats b/test/functional/update/update-use-full-file.bats index 7fc67874b..360f5f0f0 100755 --- a/test/functional/update/update-use-full-file.bats +++ b/test/functional/update/update-use-full-file.bats @@ -20,7 +20,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-use-pack.bats b/test/functional/update/update-use-pack.bats index f8f3c44fb..169c6df0b 100755 --- a/test/functional/update/update-use-pack.bats +++ b/test/functional/update/update-use-pack.bats @@ -16,7 +16,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-verify-fix-path-hash-mismatch.bats b/test/functional/update/update-verify-fix-path-hash-mismatch.bats index 001a23860..62fc337c8 100755 --- a/test/functional/update/update-verify-fix-path-hash-mismatch.bats +++ b/test/functional/update/update-verify-fix-path-hash-mismatch.bats @@ -29,7 +29,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-verify-fix-path-missing-dir.bats b/test/functional/update/update-verify-fix-path-missing-dir.bats index f95c982ff..ffd7ab991 100755 --- a/test/functional/update/update-verify-fix-path-missing-dir.bats +++ b/test/functional/update/update-verify-fix-path-missing-dir.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-verify-fullfile-hash.bats b/test/functional/update/update-verify-fullfile-hash.bats index 79f75639e..1d90281f5 100755 --- a/test/functional/update/update-verify-fullfile-hash.bats +++ b/test/functional/update/update-verify-fullfile-hash.bats @@ -26,7 +26,7 @@ test_setup() { assert_status_is 1 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 \(in format staging\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-with-mirror-signature.bats b/test/functional/update/update-with-mirror-signature.bats index 6d5a5294e..a98bc615e 100755 --- a/test/functional/update/update-with-mirror-signature.bats +++ b/test/functional/update/update-with-mirror-signature.bats @@ -31,7 +31,7 @@ test_setup() { Error: Signature for latest file (file://$ABS_MIRROR_DIR/version/formatstaging/latest) is missing Warning: the mirror version could not be determined Removing mirror configuration - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -68,7 +68,7 @@ test_setup() { Error: Signature verification failed for URL: file://$ABS_MIRROR_DIR/version/formatstaging/latest Warning: the mirror version could not be determined Removing mirror configuration - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-with-mirror.bats b/test/functional/update/update-with-mirror.bats index 3e6e11bf5..851634778 100755 --- a/test/functional/update/update-with-mirror.bats +++ b/test/functional/update/update-with-mirror.bats @@ -34,7 +34,7 @@ test_setup() { expected_output=$(cat <<-EOM Update started Checking mirror status - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-with-old-mirror.bats b/test/functional/update/update-with-old-mirror.bats index d314b0d1e..4d2117cdc 100755 --- a/test/functional/update/update-with-old-mirror.bats +++ b/test/functional/update/update-with-old-mirror.bats @@ -37,7 +37,7 @@ test_setup() { Checking mirror status Warning: the mirror version (20) is too far behind upstream version (1000) Removing mirror configuration - Preparing to update from 10 to 1000 + Preparing to update from 10 to 1000 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-with-slightly-old-mirror.bats b/test/functional/update/update-with-slightly-old-mirror.bats index 7bdf3b184..88b077be0 100755 --- a/test/functional/update/update-with-slightly-old-mirror.bats +++ b/test/functional/update/update-with-slightly-old-mirror.bats @@ -37,7 +37,7 @@ test_setup() { Update started Checking mirror status Warning: mirror version (20) is behind upstream version (100) - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction...