Skip to content

Commit 3e02487

Browse files
committed
Fix duplicate word, minor change
1 parent 50af18f commit 3e02487

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/bin/generate_common_versions.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def get_microshift_repo(minor):
138138
This function searches for a repository that provides the microshift package
139139
for the given minor version. It checks the 'rhocp' stream, then release
140140
candidate (RC), and finally engineering candidate (EC) repositories—in that
141-
order. If none are available, it returns None.
141+
order. If none are available, it returns empty string.
142142
143143
Args:
144144
minor (int): The minor version, e.g., 19 for 4.19.
@@ -162,7 +162,7 @@ def get_microshift_repo(minor):
162162
return ec
163163

164164
logging.info(f"No repository found for 4.{minor}")
165-
return None
165+
return ""
166166

167167

168168
def get_release_version_string(repo, var_name):
@@ -206,20 +206,20 @@ def get_release_version_string(repo, var_name):
206206
# branches, or the OpenShift mirror if only a RC or EC is available. It can
207207
# be empty, if no candidate for the current minor has been built yet.
208208
logging.info("Getting CURRENT_RELEASE_REPO")
209-
current_release_repo = get_microshift_repo(minor_version) or ""
209+
current_release_repo = get_microshift_repo(minor_version)
210210
current_release_version = get_release_version_string(current_release_repo, "CURRENT_RELEASE_REPO")
211211

212212
# The previous release repository value should either point to the OpenShift
213213
# mirror URL or the 'rhocp' repository name.
214214
logging.info("Getting PREVIOUS_RELEASE_REPO")
215-
previous_release_repo = get_microshift_repo(previous_minor_version) or ""
215+
previous_release_repo = get_microshift_repo(previous_minor_version)
216216
previous_release_version = get_release_version_string(previous_release_repo, "PREVIOUS_RELEASE_REPO")
217217

218218
# The y-2 release repository value should either point to the OpenShift
219219
# mirror URL or the 'rhocp' repository name. It should always come from
220220
# the 'rhocp' stream.
221221
logging.info("Getting YMINUS2_RELEASE_REPO")
222-
yminus2_release_repo = get_microshift_repo(yminus2_minor_version) or ""
222+
yminus2_release_repo = get_microshift_repo(yminus2_minor_version)
223223
yminus2_release_version = get_release_version_string(yminus2_release_repo, "YMINUS2_RELEASE_REPO")
224224

225225
# The 'rhocp_minor_y' variable should be the minor version number, if the
@@ -249,7 +249,7 @@ def get_release_version_string(repo, var_name):
249249
set -euo pipefail
250250
251251
# Following file is auto-generated using generate_common_versions.py.
252-
# It should not be edited manually.manually
252+
# It should not be edited manually.
253253
254254
if [[ "${{BASH_SOURCE[0]}}" == "${{0}}" ]]; then
255255
echo "This script must be sourced, not executed."

0 commit comments

Comments
 (0)