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

[Spyros Seimenis]

[Alex Murray (alexmurray)]

LGTM! Merge it!

review: Approve

[Rodrigo Figueiredo Zaiden (rodrigo-zaiden)]

I was proposing something similar but much more complex at:
https://code.launchpad.net/~rodrigo-zaiden/ubuntu-security-tools/+git/ubuntu-security-tools/+merge/420586

yours look much² better, thanks for that.

the only thing I noticed, please correct me if I'm wrong, is that, with that proposed changes, we are going to generate an entry for esm-apps-security for trusty, that does not exist (trusty only uses esm-infra-security)

thanks!

diff --git a/build-tools/build-sources-list b/build-tools/build-sources-list
index bb91469..e33e781 100755
--- a/build-tools/build-sources-list
+++ b/build-tools/build-sources-list
@@ -115,8 +115,12 @@ EOM
         emit_ppa_overlay "snappy-dev" "$ppa_overlay" "${ppa_overlay_release}"
 
     # ESM overlay ppas
-    elif echo "$r" | grep -q "/esm" ; then
-        ppa_overlay_release=$(echo "$r" | cut -f 1 -d '/')
+    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}"