Merge lp:~stgraber/ubuntu-archive-tools/fix-preinstalled-images into lp:ubuntu-archive-tools

[Stéphane Graber]

A few changes found to be needed during alpha-3:
 - Skip products that are in the ignored list early in the loop
 - Allow for "<product> preinstalled <arch>" syntax in product regexp
 - Always put server images in "ubuntu-server/<type>"
 - Detect preinstalled images based on "preinstalled" being part of the product
   name rather than based on the architecture.
 - Update comments to reflect reality

=== modified file 'publish-image-set'
--- publish-image-set	2012-07-18 14:26:37 +0000
+++ publish-image-set	2012-07-26 18:43:22 +0000
@@ -49,7 +49,7 @@
 # this identifies known builds
 product_re = re.compile(
     '((?:|u|lu|ku|edu|xu|myth)buntu(?: studio)?) '
-    '(alternate|desktop|dvd|server|mobile|core|active|wubi) '
+    '(alternate|desktop|dvd|server|mobile|core|active|wubi)(?: preinstalled)? '
     '(i386|amd64$|amd64\+mac|armel$|armel\+dove|armel\+omap$|armel\+omap4|'
      'armel\+ac100|armel\+mx5|armhf$|armhf\+omap$|armhf\+omap4|armhf\+ac100|'
      'armhf\+mx5|powerpc)', re.I)
@@ -126,24 +126,27 @@
     # builds
     for build in isotracker.get_builds():
         product = products[build['productid']]
+
+        # Start by skipping anything in the ignore list
+        if ignore_product_re.search(product):
+            continue
+
         if build['status_string'] != 'Ready':
             print('Ignoring %s which has status %s' %
                   (product, build['status_string']))
             continue
 
-        # warn about unknown images
+        # Fail when finding an unknown product
         m = product_re.match(product)
         if not m:
-            if not ignore_product_re.search(product):
-                sys.stderr.write('ERROR: Cannot handle product %s\n' % product)
-                sys.exit(1)
-            continue
+            sys.stderr.write('ERROR: Cannot handle product %s\n' % product)
+            sys.exit(1)
 
         project = m.group(1).lower().replace(' ', '')
         type = m.group(2).lower()
         arch = m.group(3).lower()
 
-        if arch.startswith('arm') and type != 'core':
+        if 'Preinstalled' in product:
             type = 'preinstalled-%s' % type
         if project == 'kubuntu' and type == 'mobile':
             project = 'kubuntu-mobile'
@@ -210,7 +213,7 @@
         # ubuntu-netbook) but should be published under the auspices of
         # another project (e.g. ubuntu).  This is of course NOT AT ALL
         # CONFUSING.
-        if project == 'ubuntu' and type == 'server' and primary_arches:
+        if project == 'ubuntu' and type == 'server':
             dir = 'ubuntu-server/%s' % dir
         elif project == 'ubuntu' and type == 'netbook' and primary_arches:
             dir = 'ubuntu-netbook/%s' % dir