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

[Sergio Schvezov]

phablet-flash: not formatting data when already on a system image and not doing a bootstrap and removing support from cdimage -> upgradable image backup support. --no-backup is a deprecated option

validated that system-image-cli -i is a good approach with barry to figure out if I'm on a upgradeable image

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:216
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/234/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/6

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/phablet-tools-ci/234/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested this by adding some content including an Ubuntu One account, some music and a few photos to a clean phone running trusty-proposed, then reflashed it with this phablet-flash and after flashing my content was still there.

review: Approve

[Andy Doan (doanac)]

looks good and tested locally

review: Approve

=== modified file 'phabletutils/arguments.py'
--- phabletutils/arguments.py	2013-10-15 20:02:19 +0000
+++ phabletutils/arguments.py	2013-10-28 18:50:20 +0000
@@ -63,6 +63,12 @@
         setattr(namespace, 'uri', uri)
 
 
+class DeprecatedBackup(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string=None):
+        log.warn('--no-backup is deprecated, use --bootstrap instead')
+        setattr(namespace, 'bootstrap', True)
+
+
 class RevisionAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
         log.debug('RevisionAction: %r %r %r' %
@@ -141,14 +147,13 @@
                                 server is %(default)s''')
     group = parser.add_mutually_exclusive_group()
     group.add_argument('--no-backup',
-                       action='store_false',
-                       dest='backup',
-                       help='''Disables backup procedure of current the
-                               Ubuntu install.''')
+                       action=DeprecatedBackup,
+                       nargs=0,
+                       help='''(Deprecated) Disables backup procedure of
+                               current the Ubuntu install.''')
     group.add_argument('-b',
                        '--bootstrap',
-                       action='store_false',
-                       dest='backup',
+                       action='store_true',
                        help='''Bootstraps the system into Ubuntu
                                wiping all data while doing so.''')
     return parser

=== modified file 'phabletutils/environment.py'
--- phabletutils/environment.py	2013-10-28 17:13:37 +0000
+++ phabletutils/environment.py	2013-10-28 18:50:20 +0000
@@ -185,7 +185,7 @@
         file_list=files,
         command_part=command_part,
         device=device,
-        backup=args.backup)
+        wipe=args.bootstrap)
 
 
 def setup_community(args):

=== modified file 'phabletutils/projects.py'
--- phabletutils/projects.py	2013-10-22 19:13:40 +0000
+++ phabletutils/projects.py	2013-10-28 18:50:20 +0000
@@ -20,11 +20,11 @@
 import os.path
 import tempfile
 import logging
+import subprocess
 import gzip
 
 from phabletutils.downloads import checksum_verify
 from phabletutils.resources import (File, SignedFile)
-from phabletutils import backup
 from phabletutils import downloads
 from phabletutils import fileutils
 from time import sleep
@@ -214,16 +214,15 @@
 class UbuntuTouchSystem(BaseProject):
 
     ubuntu_recovery_script = dedent('''\
-        format data
         format system
         load_keyring image-master.tar.xz image-master.tar.xz.asc
         load_keyring image-signing.tar.xz image-signing.tar.xz.asc
         mount system
         ''')
 
-    def __init__(self, file_list, device, command_part, backup):
+    def __init__(self, file_list, device, command_part, wipe):
         log.debug('UbuntuTouchSystem')
-        super(UbuntuTouchSystem, self).__init__(wipe=True)
+        super(UbuntuTouchSystem, self).__init__(wipe=wipe)
         for item in file_list:
             if item and not isinstance(item, File):
                 raise TypeError('%s is not of type File' % item)
@@ -231,7 +230,6 @@
                 self._list.append(item)
         self._recovery_list = file_list
         self._command_part = command_part
-        self._backup = backup
         self._device = device
 
     def _is_device_file(self, entry):
@@ -251,13 +249,22 @@
         log.debug('Recovery found in %s' % recovery_path)
         return recovery_path
 
-    def install(self, adb, fastboot=None):
-        """
-        Deploys recovery files, recovery script and then reboots to install.
-        """
+    def _get_current_version(self, adb):
         try:
-            backup_file = backup.backup(adb) if self._backup else None
-        except:
+            image_info = adb.shell('system-image-cli -i',
+                                   ignore_errors=False).split('\r\n')
+            version = [i.split(':')[1].strip() for i in image_info
+                       if 'build number: ' in i][0]
+            log.debug('Current version on system is %s' % version)
+            return version
+        except subprocess.CalledProcessError:
+            return '0'
+
+    def install(self, adb, fastboot=None):
+        """
+        Deploys recovery files, recovery script and then reboots to install.
+        """
+        if not self._wipe and self._get_current_version(adb) == '0':
             raise RuntimeError('Backup requested but cannot be completed '
                                'succesfully, try with --no-backup if data '
                                'saving is not important.')
@@ -266,7 +273,8 @@
         adb.reboot(bootloader=True)
         fastboot.boot(recovery_path)
         adb.wait_for_recovery()
-        wipe_device(adb)
+        if self._wipe:
+            wipe_device(adb)
 
         for entry in self._recovery_list:
             adb.push(entry.path, '/cache/recovery/')
@@ -281,14 +289,12 @@
         fastboot.flash('recovery', recovery_path)
         fastboot.boot(recovery_path)
         self._loop_until_installed(adb)
-        if backup_file:
-            log.warning('Restoring from backup')
-            backup.restore(adb, backup_file)
-            os.unlink(backup_file)
 
     def create_ubuntu_command_file(self):
         ubuntu_command_file = tempfile.NamedTemporaryFile(delete=False)
         with ubuntu_command_file as output_file:
+            if self._wipe:
+                output_file.write('format data\n')
             output_file.write(self.ubuntu_recovery_script)
             output_file.write(self._command_part)
             output_file.write('unmount system\n')