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

[Sergio Schvezov]

Don't validate device when bootstraping and move wait logic to only happen when needed which was increased to 15.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-raring-i386-ci/44

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

review: Approve (continuous-integration)

[Gema Gomez (gema)]

I have tested the change and it works fine for me. Now I can use the -b flag on mako successfully. +1

[Ricardo Salveti (rsalveti)]

LGTM, thanks.

review: Approve

=== modified file 'phablet-flash'
--- phablet-flash	2013-05-21 15:34:15 +0000
+++ phablet-flash	2013-05-24 12:11:36 +0000
@@ -218,10 +218,12 @@
     ''' Pushes artifact to devices sdcard and deploys'''
     if not artifact:
         return
+    # Can't wait-for-device here
+    sleep(15)
     adb.push(artifact, '/sdcard/autodeploy.zip')
     log.info('Deploying Ubuntu')
-    adb.shell('/sbin/recovery')
-    log.info('Installation complete, rebooting into Ubuntu')
+    adb.reboot(recovery=True)
+    log.info('Installation will complete soon and reboot into Ubuntu')
 
 
 @adb_errors
@@ -356,7 +358,7 @@
     # Initializes the adb server if it is not running
     adb.start()
     device = detect_device(adb, args.device)
-    if not args.download_only:
+    if not args.download_only and not args.bootstrap:
         if settings.validate_device:
             validate_device(adb)
     if not args.series:
@@ -411,8 +413,6 @@
         if args.bootstrap:
             fastboot = Fastboot(args.device)
             bootstrap(adb, fastboot, download_mgr.files)
-            # Can't wait-for-device here
-            sleep(10)
             autodeploy(adb, download_mgr.files.get(ubuntu_img))
         else:
             recovery_file = create_recovery_file(adb,