Merge lp:~sergiusens/phablet-tools/series_select into lp:phablet-tools

[Sergio Schvezov]

lp:~sergiusens/phablet-tools/fixing_latest

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-quantal-i386-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/19/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Rejecting based on discussions we had on IRC (we'll have another and better way to handle different series).

review: Disapprove

Unmerged revisions

83. By Sergio Schvezov on 2013-04-08

fixing pep8 issues with indentation

82. By Sergio Schvezov on 2013-04-08

Making a preset set of choices for series

81. By Sergio Schvezov on 2013-04-08

ubuntu_image renamed to ubuntu_img for consistency

80. By Sergio Schvezov on 2013-04-08

Allow downloading a specific series of the ubuntu image (LP: #1166202)

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-08 17:46:22 +0000
+++ debian/changelog	2013-04-08 17:46:22 +0000
@@ -13,6 +13,7 @@
     - The -l option is now deprecated
   * Attempt to start the adb server before executing anything (LP: #1143946) 
   * Don't attempt to re-download if complete (LP: #1163898)
+  * Allow downloading a specific series of the ubuntu image (LP: #1166202) 
 
  -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 25 Mar 2013 14:31:18 -0400
 

=== modified file 'phablet-flash'
--- phablet-flash	2013-04-08 17:46:22 +0000
+++ phablet-flash	2013-04-08 17:46:22 +0000
@@ -74,6 +74,14 @@
                         default=None,
                         help='Choose a specific build number to download.',
                        )
+    parser.add_argument('-S',
+                        '--series',
+                        required=False,
+                        default='quantal',
+                        choices=getattr(settings, 'valid_series', 'quantal'),
+                        help='''Choose to download a different series, 
+                                default is quantal.'''
+                       )
     group = parser.add_mutually_exclusive_group()
     group.add_argument('-l',
                        '--latest',
@@ -305,6 +313,16 @@
         exit(1)
 
 
+def get_ubuntu_image(series):
+    '''Returns an ubuntu image or None if not found.'''
+    ubuntu_image = getattr(settings, 'ubuntu_image', None)
+    try:
+        ubuntu_image = ubuntu_image % series
+    except TypeError:
+        pass
+    return ubuntu_image
+
+
 def main(args):
     if not has_accepted(accepted_pathname()) and \
        not query(settings.legal_notice):
@@ -316,6 +334,7 @@
     # Initializes the adb server if it is not running
     adb.start()
     device = detect_device(adb, args.device)
+    ubuntu_img = get_ubuntu_image(args.series)
     # Determine uri to download from
     if not args.uri:
         args.uri = settings.download_uri
@@ -334,14 +353,14 @@
                                '%s/quantal-ubuntu_stamp' % args.uri)
             download_dir = setup_download_directory(jenkins_build_id)
     if args.bootstrap:
-        download_list = [getattr(settings, 'ubuntu_image', None)]
+        download_list = [ubuntu_img, ]
         for attr in ('device_file_img', 'recovery_file_img', 'boot_file_img'):
             value = getattr(settings, attr, None)
             if value is not None:
                 download_list.append(value % device)
     else:
         device_img = settings.device_file % device
-        download_list = [device_img, settings.ubuntu_image]
+        download_list = [device_img, ubuntu_img]
     download_mgr = DownloadManager(args.uri, download_dir, download_list, offline)
     try:
         log.info('Retrieving files')
@@ -357,13 +376,12 @@
         if settings.validate_device:
             validate_device(adb)
         if args.bootstrap:
-            push_for_autodeploy(adb,
-                download_mgr.files.get(getattr(settings, 'ubuntu_image', None)))
+            push_for_autodeploy(adb, download_mgr.files.get(ubuntu_img))
             bootstrap(adb, download_mgr.files)
         else:
             recovery_file = create_recovery_file(adb,
                 download_mgr.files[device_img],
-                download_mgr.files[settings.ubuntu_image])
+                download_mgr.files[ubuntu_img])
             deploy_recovery_image(adb, download_mgr.files, recovery_file)
 
 
@@ -377,6 +395,5 @@
 if __name__ == "__main__":
     args = parse_arguments()
     if args.alternate_settings:
-        print "alternate settings"
         import_alt_settings(args.alternate_settings)
     main(args)

=== modified file 'phabletutils/settings.py'
--- phabletutils/settings.py	2013-04-08 17:46:22 +0000
+++ phabletutils/settings.py	2013-04-08 17:46:22 +0000
@@ -16,7 +16,7 @@
 
 download_uri = 'http://cdimage.ubuntu.com/ubuntu-touch-preview/daily-preinstalled/current'
 download_dir = 'phablet-flash'
-ubuntu_image = 'quantal-preinstalled-phablet-armhf.zip'
+ubuntu_image = '%s-preinstalled-phablet-armhf.zip'
 device_file = 'quantal-preinstalled-armel+%s.zip'
 device_file_img = 'quantal-preinstalled-system-armel+%s.img'
 boot_file_img = 'quantal-preinstalled-boot-armel+%s.img'
@@ -30,8 +30,11 @@
                      'maguro',
                      'manta',
                      'grouper',
-                    )
+                     )
 validate_device = True
+valid_series = ('quantal',
+                'raring',
+                )
 legal_notice = '''"Touch Developer Preview for Ubuntu" is released for free
 non-commercial use. It is provided without warranty, even the implied
 warranty of merchantability, satisfaction or fitness for a particular