Tiny code improvements.

Signed-off-by: Kurt Garloff <[email protected]>

Author: garloff

user-docs/usage-hints/find-image/.flake8

@@ -0,0 +1,2 @@
+[flake8]
+ignore = E501

user-docs/usage-hints/find-image/find_img.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 #
-# find-img.py
+# find_img.py
 #
-# Searches for an image with distribution and version
+# Searches for an image with distribution and version and purpose
 #
 # (c) Kurt Garloff <[email protected]>, 7/2025
 # SPDX-License-Identifier: MIT
@@ -71,17 +71,19 @@ def img_sort_heuristic(images, distro, version, purpose):
 def find_image(conn, distro, version, purpose="generic", strict=False, log=None):
     """Return a sorted list of ID,Name pairs that contain the wanted image.
        Empty list indicates no image has been found. The list is sorted such
-       that (on SCS-compliant clouds), it will very likely contain the most
-       vanilla, most recent image as first element.
+       that (on SCS-compliant clouds), it will very likely contain the best
+       matching, most recent image as first element.
        If strict is set, multiple matches are not allowed.
     """
     ldistro = distro.lower()
     # FIXME: The image.images() method only passes selected filters
+    purpose_out = purpose
     images = [x for x in conn.image.images(os_distro=ldistro, os_version=version,
                                            sort="name:desc,created_at:desc", visibility="public")
               if x.properties.get("os_purpose") == purpose]
     if len(images) == 0:
         warn(log, f"No image found with os_distro={ldistro} os_version={version} os_purpose={purpose}")
+        purpose_out = ""
         # images = list(conn.image.images(os_distro=ldistro, os_version=version,
         #                                 sort="name:desc,created_at:desc"))
         images = [x for x in conn.image.images(os_distro=ldistro, os_version=version,
@@ -92,8 +94,8 @@ def find_image(conn, distro, version, purpose="generic", strict=False, log=None)
         return []
     # Now comes sorting magic for best backwards compatibility
     if len(images) > 1:
-        debug(log, f"Several {purpose} images found with os_distro={ldistro} os_version={version}")
-        if (strict):
+        debug(log, f"Several {purpose_out} images found with os_distro={ldistro} os_version={version}")
+        if strict:
             return []
         return img_sort_heuristic(images, distro, version, purpose)
     return [(img.id, img.name) for img in images]

user-docs/usage-hints/find-image/find_img.sh

@@ -7,7 +7,7 @@
 
 usage()
 {
-	echo "Usage: find-img distro version [purpose]"
+	echo "Usage: find-img [-s] distro version [purpose]"
 	echo "Returns all images matching, latest first, purpose defaults to generic"
 	echo "If some images have the wanted purpose, only those will be shown"
 }
@@ -28,7 +28,7 @@ img_sort_heuristic()
 {
 	# Acts on global OS_RESP
 	# FIXME: We could do all sorts of advanced heuristics here, looking at the name etc.
-	# We only do one thing here: Sort the image that matches the old naming scheme first.
+	# We only do a few pattern matches here
 	# distro version purpose
 	local NEW_RESP0=$(echo "$OS_RESP" | grep -i "^[0-9a-f\-]* $1 $2 $3\$")
 	# distro version purpose with extras appended
@@ -48,10 +48,12 @@ img_sort_heuristic()
 
 get_images()
 {
-	PURPOSE=${3:-generic}
+	PURPOSE="${3:-generic}"
+	PURP="$PURPOSE"
 	get_images_raw "$1" "$2" --property os_purpose=$PURPOSE
 	if test -z "$OS_RESP"; then 
 		echo "WARN: No image found with os_distro=$1 os_version=$2 os_purpose=$PURPOSE" 1>&2
+		PURP=""
 		# We're screwed as we can not filter for the absence of os_purpose with CLI
 		# We could loop and do an image show and then flter out, but that's very slow
 		get_images_raw "$1" "$2" # --property os_purpose=
@@ -69,7 +71,7 @@ get_images()
 	if test "$NR_IMG" = "0"; then echo "ERROR: No image found with os_distro=$1 os_version=$2" 1>&2; return 1
 	elif test "$NR_IMG" = "1"; then return 0
 	else
-		echo "DEBUG: Several $PURPOSE images matching os_distro=$1 os_version=$2" 1>&2;
+		echo "DEBUG: Several $PURP images matching os_distro=$1 os_version=$2" 1>&2;
 		if test -n "$STRICT"; then return 1; fi
 		img_sort_heuristic "$1" "$2" "$PURPOSE"
 		return 0
@@ -80,10 +82,8 @@ if test -z "$OS_CLOUD" -a -z "$OS_AUTH_URL"; then
 	echo "You need to configure clouds.yaml/secure.yaml and set OS_CLOUD" 1>&2
 	exit 2
 fi
-if test -z "$1"; then
-	usage
-	exit 1
-fi
+if test "$1" = "-s"; then STRICT=1; shift; fi
+if test -z "$1"; then usage; exit 1; fi
 
 get_images "$@"
 RC=$?