ubuntu-archive-tools

Merge ubuntu-archive-tools:more-flavours into ubuntu-archive-tools:main

  1. Git
  2. lp:ubuntu-archive-tools
  3. more-flavours
  4. Merge into main
Proposed by Brian Murray
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 108281196aa5940c2333bc43c4ffdad8d4e5ba18
Merged at revision: 108281196aa5940c2333bc43c4ffdad8d4e5ba18
Proposed branch: ubuntu-archive-tools:more-flavours
Merge into: ubuntu-archive-tools:main
Diff against target: 15 lines (+2/-2)
1 file modified
publish-image-set (+2/-2)
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+440083@code.launchpad.net

Description of the change

We need to support more flavours now

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looking good! I see you added all of them, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/publish-image-set b/publish-image-set
2index 345565b..4a39162 100755
3--- a/publish-image-set
4+++ b/publish-image-set
5@@ -48,8 +48,8 @@ ignore_product_re = re.compile(
6 'Netboot |Upgrade |Server EC2|Server Windows Azure|line-through|Ubuntu WSL')
7 # this identifies known builds
8 product_re = re.compile(
9- '((?:|u|lu|ku|xu)buntu(?: studio|kylin| kylin| mate| budgie| unity)?) '
10- '(alternate|desktop(?: \(canary\))?|dvd|server(?: subiquity)?|mobile|base|active)(?: preinstalled)? '
11+ '((?:|u|lu|ku|xu|edu)buntu(?: studio|kylin| kylin| mate| budgie| unity| cinnamon)?) '
12+ '(alternate|desktop(?: \(canary\))?|desktop(?: \(legacy\))?|dvd|server(?: subiquity)?|mobile|base|active|minimal)(?: preinstalled)? '
13 '(i386|amd64$|amd64\+mac|armel$|armel\+dove|armel\+omap$|armel\+omap4|'
14 'armel\+ac100|armel\+mx5|armhf$|armhf\+omap$|armhf\+omap4|armhf\+ac100|'
15 'armhf\+mx5|armhf\+nexus7|armhf\+raspi$|armhf\+raspi2|armhf\+raspi3|'

Subscribers

People subscribed via source and target branches