Merge lp:~jibel/ubuntu-qa-tools/natty_k-mobile into lp:ubuntu-qa-tools

[Jean-Baptiste Lallement]

[Brian Murray (brian-murray)]

Looks good, but I changed the email address to lists.ubuntu.com.

review: Approve

=== modified file 'dl-ubuntu-test-iso/dl-ubuntu-test-iso'
--- dl-ubuntu-test-iso/dl-ubuntu-test-iso	2011-02-14 16:43:34 +0000
+++ dl-ubuntu-test-iso/dl-ubuntu-test-iso	2011-04-01 10:41:12 +0000
@@ -18,7 +18,7 @@
 import signal
 import tempfile
 
-current_release = 'maverick'
+current_release = 'natty'
 releasedict = {}
 releasedict['hardy'] = []
 releasedict['intrepid'] = []
@@ -26,6 +26,7 @@
 releasedict['karmic'] = []
 releasedict['lucid'] = []
 releasedict['maverick'] = []
+releasedict['natty'] = []
 #allreleases = ['hardy', 'intrepid']
 allarchs = ['i386', 'amd64', 'lpia', 'armel']
 
@@ -34,7 +35,7 @@
 default['variants'] = ['desktop', 'alternate', 'dvd']
 default['build'] = 'current'
 default['host'] = 'cdimage.ubuntu.com'
-default['releases'] = ['lucid', 'maverick']
+default['releases'] = ['lucid', 'natty']
 default['isoroot'] = environ['HOME'] + '/iso/'
 default['do_release_check'] = True
 
@@ -144,8 +145,8 @@
 ## Print footer ##
 def printFooter():
         time = datetime.datetime.utcnow()
-        print "<p>Last Updated (UTC): %s by <a href=\"https://code.launchpad.net/~sbeattie/sru-tools/sru-buglist\">sru_buglist</a>" % time.ctime()
-        print "written by <a href=\"mailto:[e-mail]\">Steve Beattie</a>.</p>"
+        print "<p>Last Updated (UTC): %s by <a href=\"https://code.launchpad.net/ubuntu-qa-tools\">ubuntu-qa-tools</a>" % time.ctime()
+        print "written by <a href=\"mailto:[e-mail]\">Ubuntu QA Team</a>.</p>"
         print "</body></html>"
 
 def dumpHeaders(headers):
@@ -449,20 +450,21 @@
 		print "%s %s %s %s %s" %(release, flavor.name, variant, arch, variantpaths[variant])
 
 def image_factory(wanted):
-	for release in releasedict.keys():
-		if release not in wanted['releases']:
-			continue
-		for flavor in releasedict[release]:
-			if flavor.name not in wanted['flavors']:
-				continue
-			for variant in flavor.variants:
-				if variant not in wanted['variants']:
-					continue
-				for arch in flavor.archs:
-					if arch not in wanted['archs']:
-						continue
-					yield (release, flavor, variant, arch)
-					#print "%s %s %s %s %s" %(release, flavor.name, variant, arch, variantpaths[variant])
+    for release in releasedict.keys():
+        if release not in wanted['releases']:
+            continue
+        for flavor in releasedict[release]:
+            if flavor.name not in wanted['flavors']:
+                continue
+            for variant in flavor.variants:
+                if variant not in wanted['variants']:
+                    continue
+
+                for arch in flavor.archs:
+                    if arch not in wanted['archs']:
+                        continue
+                    yield (release, flavor, variant, arch)
+                    #print "%s %s %s %s %s" %(release, flavor.name, variant, arch, variantpaths[variant])
 
 def read_config(pathname):
     '''Read the config file, using shell syntax for backwards
@@ -520,6 +522,7 @@
     variantpaths['netbook-remix'] = 'daily-live'
     variantpaths['netbook'] = 'daily-live'
     variantpaths['moblin-remix'] = 'daily-live'
+    variantpaths['mobile'] = 'daily-live'
 
     Flavor('ubuntu', use_prefix=False)
     Flavor('ubuntu-server', variants=['server'])
@@ -534,6 +537,7 @@
     Flavor('ubuntu-mid', variants=['usb'], archs=['lpia'])
     Flavor('ubuntu-netbook', variants=['netbook'], archs=['i386'])
     Flavor('kubuntu-netbook', variants=['netbook'], archs=['i386'])
+    Flavor('kubuntu-mobile', variants=['mobile'], archs=['i386'])
     Flavor('ubuntu-moblin-remix', variants=['moblin-remix'], archs=['i386'])
 
     default['variants'] = variantpaths.keys()