From 6fd7f75e20f4f0cdaa694edbd25ce57e8f9a8ba8 Mon Sep 17 00:00:00 2001
From: Juerg Haefliger <juerg.haefliger@canonical.com>
Date: Tue, 4 Jul 2023 10:25:39 +0200
Subject: [PATCH] UBUNTU: [Packaging] checks/final-checks: check existance of
 Makefile first

Check that the per-arch Makefile exists before trying to read it.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian/scripts/checks/final-checks | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/checks/final-checks b/debian/scripts/checks/final-checks
index 5581bb644a14..2c03c47d0321 100755
--- a/debian/scripts/checks/final-checks
+++ b/debian/scripts/checks/final-checks
@@ -63,13 +63,15 @@ fi
 
 for arch in $archs
 do
+	if [ ! -f "$debian/rules.d/$arch.mk" ]; then
+		continue
+	fi
+
 	image_pkg=$(awk -F '\\s*=\\s*' '$1 == "do_flavour_image_package" { print $2 }' $debian/rules.d/$arch.mk)
 	if [ "$image_pkg" = "false" ]; then
 		continue
 	fi
-	if [ ! -f "$debian/rules.d/$arch.mk" ]; then
-		continue
-	fi
+
 	flavours=$(
 		awk '/^\s*flavours\s*=/{
 			sub(/^\s*flavours\s*=\s*/, "");