Skip to content

Commit 44fc186

Browse files
committed
Replace "master" word with less evocative synonyms
The few occurances in a specification of older formats, e.g. modulemd-packager-v2 are left intact because those are constants of the respective formats. There were not updated in commit dc09c4b on purpose to preserve compatibility.
1 parent b9ba941 commit 44fc186

22 files changed

Lines changed: 480 additions & 478 deletions

modulemd/include/modulemd-2.0/modulemd-module-index.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ G_DECLARE_FINAL_TYPE (
8787
* The number of written bytes should be set to the @size_read variable.
8888
*
8989
* This handler is identical to a
90-
* [yaml_read_handler_t](https://github.com/yaml/libyaml/blob/master/include/yaml.h#L988)
90+
* [yaml_read_handler_t in yaml.h header of
91+
* libyaml](https://github.com/yaml/libyaml/blob/2c891fc7a770e8ba2fec34fc6b545c672beb37e6/include/yaml.h#L988)
9192
* but is included here to avoid depending on yaml.h in modulemd headers.
9293
*
9394
* Returns: On success, the handler must return 1. If the handler failed,
@@ -115,7 +116,8 @@ typedef gint (*ModulemdReadHandler) (void *data,
115116
* @buffer to the output.
116117
*
117118
* This handler is identical to a
118-
* [yaml_write_handler_t](https://github.com/yaml/libyaml/blob/master/include/yaml.h#L1478)
119+
* [yaml_write_handler_t in yaml.h header of
120+
* libyaml](https://github.com/yaml/libyaml/blob/2c891fc7a770e8ba2fec34fc6b545c672beb37e6/include/yaml.h#L1478)
119121
* but is included here to avoid depending on yaml.h in modulemd headers.
120122
*
121123
* Returns: On success, the handler must return 1. If the handler failed,

modulemd/tests/test-modulemd-moduleindex.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ module_index_test_custom_read (void)
10891089
"version: 2\n"
10901090
"data:\n"
10911091
" name: testmodule\n"
1092-
" stream: master\n"
1092+
" stream: main\n"
10931093
" version: 20180405123256\n"
10941094
" context: c2c572ec\n"
10951095
" arch: x86_64\n"
@@ -1147,7 +1147,7 @@ module_index_test_custom_read (void)
11471147
" rationale: A dependency of tangerine.\n"
11481148
" repository: git://pkgs.fedoraproject.org/rpms/perl-List-Compare\n"
11491149
" cache: http://pkgs.fedoraproject.org/repo/pkgs/perl-List-Compare\n"
1150-
" ref: master\n"
1150+
" ref: main\n"
11511151
" perl-Tangerine:\n"
11521152
" rationale: Provides API for this module and is a dependency of tangerine.\n"
11531153
" repository: git://pkgs.fedoraproject.org/rpms/perl-Tangerine\n"
@@ -1157,7 +1157,7 @@ module_index_test_custom_read (void)
11571157
" rationale: Provides API for this module.\n"
11581158
" repository: git://pkgs.fedoraproject.org/rpms/tangerine\n"
11591159
" cache: http://pkgs.fedoraproject.org/repo/pkgs/tangerine\n"
1160-
" ref: master\n"
1160+
" ref: main\n"
11611161
" buildorder: 10\n"
11621162
" artifacts:\n"
11631163
" rpms:\n"
@@ -1205,7 +1205,7 @@ module_index_test_custom_write (void)
12051205
"version: 2\n"
12061206
"data:\n"
12071207
" name: testmodule\n"
1208-
" stream: master\n"
1208+
" stream: main\n"
12091209
" version: 20180405123256\n"
12101210
" context: c2c572ec\n"
12111211
" arch: x86_64\n"
@@ -1263,7 +1263,7 @@ module_index_test_custom_write (void)
12631263
" rationale: A dependency of tangerine.\n"
12641264
" repository: git://pkgs.fedoraproject.org/rpms/perl-List-Compare\n"
12651265
" cache: http://pkgs.fedoraproject.org/repo/pkgs/perl-List-Compare\n"
1266-
" ref: master\n"
1266+
" ref: main\n"
12671267
" perl-Tangerine:\n"
12681268
" rationale: Provides API for this module and is a dependency of tangerine.\n"
12691269
" repository: git://pkgs.fedoraproject.org/rpms/perl-Tangerine\n"
@@ -1273,7 +1273,7 @@ module_index_test_custom_write (void)
12731273
" rationale: Provides API for this module.\n"
12741274
" repository: git://pkgs.fedoraproject.org/rpms/tangerine\n"
12751275
" cache: http://pkgs.fedoraproject.org/repo/pkgs/tangerine\n"
1276-
" ref: master\n"
1276+
" ref: main\n"
12771277
" buildorder: 10\n"
12781278
" artifacts:\n"
12791279
" rpms:\n"

modulemd/tests/test_data/290.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ document: modulemd
22
version: 1
33
data:
44
name: testmodule
5-
stream: master
5+
stream: main
66
version: 20180205135154
77
context: 9c690d0e
88
summary: A test module in all its beautiful beauty
@@ -57,16 +57,16 @@ data:
5757
perl-List-Compare:
5858
rationale: A dependency of tangerine.
5959
repository: https://src.fedoraproject.org/rpms/perl-List-Compare
60-
ref: master
60+
ref: main
6161
cache: http://pkgs.fedoraproject.org/repo/pkgs/perl-List-Compare
6262
tangerine:
6363
rationale: Provides API for this module.
6464
buildorder: 10
6565
repository: https://src.fedoraproject.org/rpms/tangerine
66-
ref: master
66+
ref: main
6767
cache: http://pkgs.fedoraproject.org/repo/pkgs/tangerine
6868
perl-Tangerine:
6969
rationale: Provides API for this module and is a dependency of tangerine.
7070
repository: https://src.fedoraproject.org/rpms/perl-Tangerine
71-
ref: master
71+
ref: main
7272
cache: http://pkgs.fedoraproject.org/repo/pkgs/perl-Tangerine

modulemd/tests/test_data/buildafter/both_same_component_v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ data:
4545
ref: 1
4646
http-parser:
4747
rationale: Needed for parsing HTTP requests
48-
ref: master
48+
ref: main
4949
nghttp2:
5050
rationale: Needed for HTTP2 support
51-
ref: master
51+
ref: main
5252
nodejs:
5353
rationale: Javascript runtime and npm package manager.
5454
ref: 10

modulemd/tests/test_data/buildafter/good_buildafter_v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ data:
4545
ref: 1
4646
http-parser:
4747
rationale: Needed for parsing HTTP requests
48-
ref: master
48+
ref: main
4949
nghttp2:
5050
rationale: Needed for HTTP2 support
51-
ref: master
51+
ref: main
5252
nodejs:
5353
rationale: Javascript runtime and npm package manager.
5454
ref: 10

modulemd/tests/test_data/buildafter/invalid_key_v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ data:
4545
ref: 1
4646
http-parser:
4747
rationale: Needed for parsing HTTP requests
48-
ref: master
48+
ref: main
4949
nghttp2:
5050
rationale: Needed for HTTP2 support
51-
ref: master
51+
ref: main
5252
nodejs:
5353
rationale: Javascript runtime and npm package manager.
5454
ref: 10

modulemd/tests/test_data/buildafter/mixed_buildorder_v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ data:
4646
buildorder: 10
4747
http-parser:
4848
rationale: Needed for parsing HTTP requests
49-
ref: master
49+
ref: main
5050
buildorder: 10
5151
nghttp2:
5252
rationale: Needed for HTTP2 support
53-
ref: master
53+
ref: main
5454
buildorder: 10
5555
nodejs:
5656
rationale: Javascript runtime and npm package manager.

modulemd/tests/test_data/buildarches/bad_combo_arches_v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ data:
4747
ref: 1
4848
http-parser:
4949
rationale: Needed for parsing HTTP requests
50-
ref: master
50+
ref: main
5151
arches: [i686, x86_64]
5252
nghttp2:
5353
rationale: Needed for HTTP2 support
54-
ref: master
54+
ref: main
5555
nodejs:
5656
rationale: Javascript runtime and npm package manager.
5757
ref: 10

modulemd/tests/test_data/buildarches/good_combo_arches_v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ data:
4747
ref: 1
4848
http-parser:
4949
rationale: Needed for parsing HTTP requests
50-
ref: master
50+
ref: main
5151
arches: [ppc64le, x86_64]
5252
nghttp2:
5353
rationale: Needed for HTTP2 support
54-
ref: master
54+
ref: main
5555
nodejs:
5656
rationale: Javascript runtime and npm package manager.
5757
ref: 10

modulemd/tests/test_data/buildarches/good_no_arches_v2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ data:
4545
ref: 1
4646
http-parser:
4747
rationale: Needed for parsing HTTP requests
48-
ref: master
48+
ref: main
4949
nghttp2:
5050
rationale: Needed for HTTP2 support
51-
ref: master
51+
ref: main
5252
nodejs:
5353
rationale: Javascript runtime and npm package manager.
5454
ref: 10

0 commit comments

Comments
 (0)