From a6c63ce567db1daff875a0c565b13bf8eef6f1d4 Mon Sep 17 00:00:00 2001 From: Joep van Delft Date: Thu, 14 Jul 2022 16:40:41 +0200 Subject: [PATCH] Do not generate previous for preview --- doozerlib/cli/release_gen_assembly.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doozerlib/cli/release_gen_assembly.py b/doozerlib/cli/release_gen_assembly.py index faa033656..6d90fe511 100644 --- a/doozerlib/cli/release_gen_assembly.py +++ b/doozerlib/cli/release_gen_assembly.py @@ -70,9 +70,6 @@ def exit_with_error(msg): if auto_previous and previous_list: exit_with_error('Cannot use `--previous` and `--auto-previous` at the same time.') - if custom and (auto_previous or previous_list or in_flight): - exit_with_error("Custom release doesn't have previous list.") - assembly_type = 'standard' if custom: assembly_type = 'custom' @@ -81,13 +78,17 @@ def exit_with_error(msg): elif re.search(r'^ec\.[0-9]+$', gen_assembly_name): assembly_type = 'preview' + if custom or assembly_type == 'preview': + if auto_previous or previous_list or in_flight: + exit_with_error("Custom release doesn't have previous list.") + # Calculate previous list final_previous_list: Set[VersionInfo] = set() if in_flight: final_previous_list.add(VersionInfo.parse(in_flight)) if previous_list: final_previous_list |= set(map(VersionInfo.parse, previous_list)) - elif auto_previous and assembly_type not in ['preview', 'custom']: + elif auto_previous and assembly_type != 'custom': # gen_assembly_name should be in the form of `fc.0`, `rc.1`, or `4.10.1` if assembly_type == 'candidate': major_minor = runtime.get_minor_version() # x.y