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

Proposed by Spyros Seimenis
Status: Needs review
Proposed branch: ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:sespiros/fix-build-sources-list
Merge into: ubuntu-security-tools:master
Diff against target: 19 lines (+6/-2)
1 file modified
build-tools/build-sources-list (+6/-2)
Reviewer Review Type Date Requested Status
Alex Murray Approve
Review via email: mp+422373@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Murray (alexmurray) wrote :

LGTM! Merge it!

review: Approve
Revision history for this message
Rodrigo Figueiredo Zaiden (rodrigo-zaiden) wrote :

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!

Unmerged commits

315b8f8... by Spyros Seimenis

Change build-sources-list to handle esm-X/* naming convention

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/build-tools/build-sources-list b/build-tools/build-sources-list
2index bb91469..e33e781 100755
3--- a/build-tools/build-sources-list
4+++ b/build-tools/build-sources-list
5@@ -115,8 +115,12 @@ EOM
6 emit_ppa_overlay "snappy-dev" "$ppa_overlay" "${ppa_overlay_release}"
7
8 # ESM overlay ppas
9- elif echo "$r" | grep -q "/esm" ; then
10- ppa_overlay_release=$(echo "$r" | cut -f 1 -d '/')
11+ elif echo "$r" | grep -q "esm" ; then
12+ if echo "$r" | grep -E "trusty|precise"; then
13+ ppa_overlay_release=$(echo "$r" | cut -f 1 -d '/')
14+ else
15+ ppa_overlay_release=$(echo "$r" | cut -f 2 -d '/')
16+ fi
17 if [ "$ppa_overlay_release" = "precise" ] ; then
18 ppa_overlay="esm"
19 emit_private_ppa_overlay "ubuntu-esm" "$ppa_overlay" "${ppa_overlay_release}"

Subscribers

People subscribed via source and target branches