Merge ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:fix-build-sources-list-v2 into ubuntu-security-tools:master

[Spyros Seimenis]

e46e999... by Spyros Seimenis on 2022-05-13

Rework build-sources-list to handle trusty apps

17d5895... by Spyros Seimenis on 2022-05-13

build-sources-list: Make the code cleaner

6f2e94e... by Spyros Seimenis on 2022-05-13

build-sources-list: Fix trusty infra case

[Rodrigo Figueiredo Zaiden (rodrigo-zaiden)]

LGTM! Thanks :)

review: Approve

[Spyros Seimenis (sespiros)]

Merged (by squash and rebase). Thanks for reviewing!

diff --git a/build-tools/build-sources-list b/build-tools/build-sources-list
index e33e781..29fba67 100755
--- a/build-tools/build-sources-list
+++ b/build-tools/build-sources-list
@@ -115,26 +115,24 @@ EOM
         emit_ppa_overlay "snappy-dev" "$ppa_overlay" "${ppa_overlay_release}"
 
     # ESM overlay ppas
-    elif echo "$r" | grep -q "esm" ; then
-        if echo "$r" | grep -E "trusty|precise"; then
-            ppa_overlay_release=$(echo "$r" | cut -f 1 -d '/')
-        else
-            ppa_overlay_release=$(echo "$r" | cut -f 2 -d '/')
-        fi
-        if [ "$ppa_overlay_release" = "precise" ] ; then
-            ppa_overlay="esm"
-            emit_private_ppa_overlay "ubuntu-esm" "$ppa_overlay" "${ppa_overlay_release}"
-	    echo "# Requires gpg keyid DBB1FC89762BF6B96707C4059BC0A1A1622CF918"
-        else
-            # newer ESM releases are in the esm-infra-security and
-            # esm-apps-security ppas
+    elif echo "$r" | grep -q "/esm" ; then
+        ppa_overlay_release=$(echo "$r" | cut -f 1 -d '/')
+        ppa_overlay="esm"
+        if [ $ppa_overlay_release = "trusty" ]; then
             ppa_overlay="esm-infra-security"
-            emit_private_ppa_overlay "ubuntu-esm" "$ppa_overlay" "${ppa_overlay_release}"
-	    echo "# Requires gpg keyid DBB1FC89762BF6B96707C4059BC0A1A1622CF918"
-            ppa_overlay="esm-apps-security"
-            emit_private_ppa_overlay "ubuntu-esm" "$ppa_overlay" "${ppa_overlay_release}"
-	    echo "# Requires gpg keyid DBB1FC89762BF6B96707C4059BC0A1A1622CF918"
         fi
+
+        emit_private_ppa_overlay "ubuntu-esm" "$ppa_overlay" "${ppa_overlay_release}"
+        echo "# Requires gpg keyid DBB1FC89762BF6B96707C4059BC0A1A1622CF918"
+    # newer ESM releases are in the esm-infra-security and
+    # esm-apps-security ppas
+    elif echo "$r" | grep -q "esm-" ; then
+        ppa_overlay_release=$(echo "$r" | cut -f 2 -d '/')
+        product=$(echo "$r" | cut -f 1 -d '/')
+        ppa_overlay="$product-security"
+
+        emit_private_ppa_overlay "ubuntu-esm" "$ppa_overlay" "${ppa_overlay_release}"
+        echo "# Requires gpg keyid DBB1FC89762BF6B96707C4059BC0A1A1622CF918"
     # normal ubuntu releases.
     else
         if [ "$r" = "precise" ] ; then