coreos/fedora-coreos-config
1
0
Fork 0
mirror of https://github.com/coreos/fedora-coreos-config.git synced 2026-02-05 09:45:30 +01:00
Code Issues Releases Activity

versionary: handle corner case with SCOS versioning

Browse Source 
Since the base version of SCOS is 9.0 then the y component will
be 0 and the `if not y` will evaluate to True when we don't want it
to. Let's switch the initial values to be None and explicitly check
against None in the cases where we want to determine if the y or z
have been set yet or not.
This commit is contained in:
Dusty Mabe
2026-01-28 16:35:24 -05:00
parent 765d3011b6
commit 8deb9a6147
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
versionary
View File

@@ -46,7 +46,7 @@ def main():
assert os.path.isdir('builds'), 'Missing builds/ dir' assert os.path.isdir('builds'), 'Missing builds/ dir'
# Initialize all the components of our versions # Initialize all the components of our versions
x, y, z, n = (0, 0, 0, 0) x, y, z, n = (None, None, None, None)
# Pick up values from our build-args. # Pick up values from our build-args.
config = dotenv.dotenv_values(args.build_args) config = dotenv.dotenv_values(args.build_args)
@@ -61,13 +61,13 @@ def main():
# The y component in FCOS is the timestamp, while in RHCOS/SCOS # The y component in FCOS is the timestamp, while in RHCOS/SCOS
# it's the z component. We'll convert to a YYYYMMDD formatted string. # it's the z component. We'll convert to a YYYYMMDD formatted string.
if not y: if y is None:
y = int(dt.strftime('%Y%m%d')) y = int(dt.strftime('%Y%m%d'))
else: else:
z = int(dt.strftime('%Y%m%d')) z = int(dt.strftime('%Y%m%d'))
# At this point if z isn't defined then we're FCOS # At this point if z isn't defined then we're FCOS
if not z: if z is None:
z = FCOS_STREAM_TO_NUM[config['STREAM']] z = FCOS_STREAM_TO_NUM[config['STREAM']]
# For !FCOS and in dev mode we'll default to getting the build ID # For !FCOS and in dev mode we'll default to getting the build ID
@@ -137,7 +137,7 @@ def get_timestamp():
def split_base_version(base_version): def split_base_version(base_version):
components = base_version.split('.') components = base_version.split('.')
if len(components) == 1: if len(components) == 1:
return int(components[0]), 0 return int(components[0]), None
else: else:
return int(components[0]), int(components[1]) return int(components[0]), int(components[1])