Merge lp:~popey/phablet-tools/download-only into lp:phablet-tools

[Alan Pope 🍺🐧🐱 🦄]

Adds a -D option which forces the download to happen without validating the device is attached. Useful if you want to download the image without having the device nearby - e.g. via cron overnight.

-D requires that -d is also used, to specify the device type. So example use:-

phablet-flash -l -D -d grouper

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:64
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~popey/phablet-tools/download-only/+merge/152596/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/./build=pbuilder,distribution=quantal,flavor=i386/13/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/13//rebuild/?

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

rejected, will re-work.

Unmerged revisions

64. By Alan Pope 🍺🐧🐱 🦄 on 2013-03-10

add download-only option

=== modified file 'phablet-flash'
--- phablet-flash	2013-02-26 16:04:10 +0000
+++ phablet-flash	2013-03-10 20:44:21 +0000
@@ -85,6 +85,13 @@
                        required=False,
                        help='Alternate download uri',
                       )
+    parser.add_argument('-D',
+                       '--download',
+                       required=False,
+                       help='''Download image only, but do not flash device
+                               Requires target device specified with -d.''',
+                       action='store_true',
+                      )
     return parser.parse_args()
 
 
@@ -295,7 +302,24 @@
         adb = AndroidBridge(args.serial)
     else:
         adb = AndroidBridge()
-    device = validate_device(adb, args.device)
+    if args.download:
+        download_only = True
+        if args.bootstrap:
+            log.error('Bootstrap and download options are exclusive, specify one only')
+            exit(1)
+        if args.device:
+            if args.device not in settings.supported_devices:
+                log.error('Unsupported device, autodetect fails device')
+                exit(1)
+            else:
+                device = args.device
+        else:
+            log.error('Device type must be specified when in download only mode')
+            exit(1)
+    else:
+        download_only = False
+    if not download_only:
+        device = validate_device(adb, args.device)
     # Determine uri to download from
     if not args.uri:
         args.uri = settings.download_uri
@@ -333,16 +357,17 @@
     except subprocess.CalledProcessError:
         log.error('Error while downloading, ensure connection')
         exit(1)
-    if args.bootstrap:
-        push_for_autodeploy(adb, download_mgr.files[settings.ubuntu_image])
-        bootstrap(adb, download_mgr.files[recovery_img],
-                  download_mgr.files[device_img],
-                  download_mgr.files[boot_img],)
-    else:
-        recovery_file = create_recovery_file(adb,
-            download_mgr.files[device_img],
-            download_mgr.files[settings.ubuntu_image])
-        deploy_recovery_image(adb, download_mgr.files, recovery_file)
+    if not download_only:
+        if args.bootstrap:
+            push_for_autodeploy(adb, download_mgr.files[settings.ubuntu_image])
+            bootstrap(adb, download_mgr.files[recovery_img],
+                      download_mgr.files[device_img],
+                      download_mgr.files[boot_img],)
+        else:
+            recovery_file = create_recovery_file(adb,
+                download_mgr.files[device_img],
+                download_mgr.files[settings.ubuntu_image])
+            deploy_recovery_image(adb, download_mgr.files, recovery_file)
 
 
 if __name__ == "__main__":