From 241da9d417675b40e2855e3bab1a3aa91a996c24 Mon Sep 17 00:00:00 2001
From: Faustin Lammler <faustin@fala.red>
Date: Thu, 19 Oct 2023 18:37:19 +0200
Subject: [PATCH] Fix previous release detection

The previous release detection mechanism was broken. Also since we do
not handle correctly when BB should do install and upgrade tests, let's
skip (by not failing) test that can't succeed since packages where not
released.
---
 scripts/bash_lib.sh | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/scripts/bash_lib.sh b/scripts/bash_lib.sh
index d9634944..8d4104ad 100644
--- a/scripts/bash_lib.sh
+++ b/scripts/bash_lib.sh
@@ -180,17 +180,16 @@ deb_setup_mariadb_mirror() {
     bb_log_err "missing the branch variable"
     exit 1
   }
-  branch=$1
-  if [[ $branch == "$development_branch" ]]; then
-    #TOFIX - temp hack
-    prev_released=$((${branch/1[0-9]./} - 1))
-    if ((prev_released < 0)); then
-      branch="10.11"
-    else
-      branch="10.$prev_released"
-    fi
-    bb_log_info "using previous $branch released version for development branch $1"
+  branch_tmp=$1
+  major=${branch_tmp%.*}
+  minor=${branch_tmp##*.}
+  if [[ $branch_tmp == "11.0" ]]; then
+    prev_release="10.11"
+  else
+    prev_release="$major.$((minor - 1))"
   fi
+  branch=$prev_release
+  bb_log_info "using previous $branch released version for development branch $1"
   bb_log_info "setup MariaDB repository for $branch branch"
   command -v wget >/dev/null || {
     bb_log_err "wget command not found"
@@ -209,8 +208,12 @@ deb_setup_mariadb_mirror() {
       exit 1
     }
   else
-    bb_log_err "deb_setup_mariadb_mirror: $branch packages for $dist_name $version_name does not exist on https://deb.mariadb.org/"
-    exit 1
+    # the correct way of handling this would be to not even start the check
+    # since we know it will always fail. But apparently, it's not going to
+    # happen soon in BB. Once done though, replace the warning with an error
+    # and use a non-zero exit code.
+    bb_log_warn "deb_setup_mariadb_mirror: $branch packages for $dist_name $version_name does not exist on https://deb.mariadb.org/"
+    exit 0
   fi
   set +u
 }