Skip to content
This repository was archived by the owner on Aug 7, 2025. It is now read-only.

Commit acad8c4

Browse files
William Douglasbryteise
authored andcommitted
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 <william.douglas@intel.com>
1 parent 700b9ed commit acad8c4

File tree

61 files changed

+94
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+94
-94
lines changed

src/cmds/update.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ enum swupd_code execute_update_extra(extra_proc_fn_t post_update_fn, extra_proc_
337337
goto clean_curl;
338338
}
339339

340-
info("Preparing to update from %i to %i\n", current_version, server_version);
340+
info("Preparing to update from %i to %i (in format %s)\n", current_version, server_version, globals.format_string);
341341
timelist_timer_stop(globals.global_times); // closing: Get versions
342342

343343
/* housekeeping */

test/functional/3rd-party/3rd-party-update-basic.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ test_setup() {
3333
expected_output=$(cat <<-EOM
3434
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
3535
Update started
36-
Preparing to update from 10 to 20
36+
Preparing to update from 10 to 20 (in format staging)
3737
Downloading packs for:
3838
- test-bundle1
3939
Finishing packs extraction...
@@ -87,7 +87,7 @@ test_setup() {
8787
__________________________________
8888
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
8989
Update started
90-
Preparing to update from 10 to 20
90+
Preparing to update from 10 to 20 (in format staging)
9191
Downloading packs for:
9292
- test-bundle1
9393
Finishing packs extraction...

test/functional/3rd-party/3rd-party-update-dangerous-flags.bats

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ test_setup() {
5151
_____________________________
5252
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
5353
Update started
54-
Preparing to update from 10 to 20
54+
Preparing to update from 10 to 20 (in format staging)
5555
Downloading packs for:
5656
- test-bundle1
5757
Finishing packs extraction...
@@ -93,7 +93,7 @@ test_setup() {
9393
_____________________________
9494
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
9595
Update started
96-
Preparing to update from 10 to 20
96+
Preparing to update from 10 to 20 (in format staging)
9797
Downloading packs for:
9898
- test-bundle1
9999
Finishing packs extraction...
@@ -133,7 +133,7 @@ test_setup() {
133133
_____________________________
134134
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
135135
Update started
136-
Preparing to update from 10 to 20
136+
Preparing to update from 10 to 20 (in format staging)
137137
Downloading packs for:
138138
- test-bundle1
139139
Finishing packs extraction...
@@ -167,7 +167,7 @@ test_setup() {
167167
_____________________________
168168
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
169169
Update started
170-
Preparing to update from 10 to 20
170+
Preparing to update from 10 to 20 (in format staging)
171171
Downloading packs for:
172172
- test-bundle1
173173
Finishing packs extraction...

test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ test_setup() {
5656
_____________________________
5757
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
5858
Update started
59-
Preparing to update from 10 to 20
59+
Preparing to update from 10 to 20 (in format staging)
6060
Downloading packs for:
6161
- os-core
6262
- test-bundle1
@@ -152,7 +152,7 @@ test_setup() {
152152
expected_output=$(cat <<-EOM
153153
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
154154
Update started
155-
Preparing to update from 10 to 20
155+
Preparing to update from 10 to 20 (in format staging)
156156
Downloading packs for:
157157
- os-core
158158
- test-bundle1

test/functional/3rd-party/3rd-party-update-export-template.bats

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ test_setup() {
4444
_____________________________
4545
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
4646
Update started
47-
Preparing to update from 10 to 20
47+
Preparing to update from 10 to 20 (in format staging)
4848
Downloading packs for:
4949
- os-core
5050
- test-bundle1
@@ -112,7 +112,7 @@ test_setup() {
112112
_____________________________
113113
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
114114
Update started
115-
Preparing to update from 10 to 20
115+
Preparing to update from 10 to 20 (in format staging)
116116
Downloading packs for:
117117
- os-core
118118
- test-bundle1
@@ -186,7 +186,7 @@ test_setup() {
186186
_____________________________
187187
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
188188
Update started
189-
Preparing to update from 10 to 20
189+
Preparing to update from 10 to 20 (in format staging)
190190
Downloading packs for:
191191
- os-core
192192
- test-bundle1

test/functional/3rd-party/3rd-party-update-exported-bin.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ test_setup() {
5050
_____________________________
5151
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
5252
Update started
53-
Preparing to update from 10 to 20
53+
Preparing to update from 10 to 20 (in format staging)
5454
Downloading packs for:
5555
- test-bundle3
5656
- os-core

test/functional/3rd-party/3rd-party-update-specific-version.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test_setup() {
2828
expected_output=$(cat <<-EOM
2929
Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons
3030
Update started
31-
Preparing to update from 10 to 20
31+
Preparing to update from 10 to 20 (in format staging)
3232
Downloading packs for:
3333
- test-bundle1
3434
Finishing packs extraction...

test/functional/bundlelist/list-orphans.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ teardown_file() {
7575
assert_status_is 0
7676
expected_output=$(cat <<-EOM
7777
Update started
78-
Preparing to update from 10 to 20
78+
Preparing to update from 10 to 20 (in format staging)
7979
Downloading packs for:
8080
- os-core
8181
Finishing packs extraction...

test/functional/bundleremove/remove-orphans.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ test_setup() {
6767
assert_status_is 0
6868
expected_output=$(cat <<-EOM
6969
Update started
70-
Preparing to update from 10 to 20
70+
Preparing to update from 10 to 20 (in format staging)
7171
Downloading packs for:
7272
- os-core
7373
Finishing packs extraction...

test/functional/only_in_ci_slow/update-non-responsive.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ test_setup() {
112112
Checking mirror status
113113
Warning: Upstream server http://localhost:$port/ not responding, cannot determine upstream version
114114
Warning: Unable to determine if the mirror is up to date
115-
Preparing to update from 10 to 20
115+
Preparing to update from 10 to 20 \(in format staging\)
116116
Downloading packs for:
117117
- os-core
118118
Finishing packs extraction...

0 commit comments

Comments
 (0)