Merge ~virtustom/ubuntu-docker-images/+git/utils:fix-devel into ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:main

[Tomáš Virtus]

Don't fail when there's new devel release

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP. As we've already discussed this on Mattermost, I'm approving and merging it.

review: Approve

diff --git a/tag-images.sh b/tag-images.sh
index 61797f2..b7dd08a 100755
--- a/tag-images.sh
+++ b/tag-images.sh
@@ -126,10 +126,20 @@ do_tag_base_ubuntu_image ()
     local -a IMAGE_TAGS EDGE_TAGS
 
     local DISTRONAME_DEVEL DISTRONAME_STABLE DISTRONAME_LTS
-    DISTRONAME_DEVEL=$(distro-info --devel)
     DISTRONAME_STABLE=$(distro-info --stable)
     DISTRONAME_LTS=$(distro-info --lts)
 
+    # On new release day and some time after when there's no new devel
+    # entry in /usr/share/distro-info/ubuntu.csv, "distro-info
+    # --devel" fails with "Distribution data outdated." error message.
+    # In that case keep DISTRONAME_DEVEL empty and continue.
+    local ret=0
+    DISTRONAME_DEVEL=$(LC_ALL=C distro-info --devel 2>&1) || ret=$?
+    if [[ $ret -ne 0 && "$DISTRONAME_DEVEL" != *"Distribution data outdated"* ]]; then
+	echo "$DISTRONAME_DEVEL" >&2
+	return $ret
+    fi
+
     readarray -t IMAGE_TAGS < <(print_tags_for_image "${image}")
 
     readarray -t EDGE_TAGS < <(printf '%s\n' "${IMAGE_TAGS[@]}" \