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

[Sergio Schvezov]

Using device file from system image server to extract recovery instead of downloading the latest from cdimage.

Keep in mind that by accepting this, you are marking partitions/recovery.img as a stable interface.

I can add some magic to finding and extracting the right file, but this may as well be stable.

[Stéphane Graber (stgraber)]

Assuming this was tested, the code change looks good.

Note that in python3 python-tarfile supports opening xz-compressed files directly ("r:xz" mode) but I had reliability problems when doing that as part of the server work, so using lzma + uncompressed tarfile is probably safest at this point.

[Stéphane Graber (stgraber)]

Oh, the above comment was meant to be an ack.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-08-20 20:45:44 +0000
+++ debian/control	2013-09-04 12:58:37 +0000
@@ -5,6 +5,7 @@
 Build-Depends: debhelper (>= 9.0.0),
                python (>= 2.7),
                python-configobj,
+               python-lzma,
                python-mock,
                python-requests,
                python-setuptools,

=== modified file 'phabletutils/environment.py'
--- phabletutils/environment.py	2013-08-28 14:17:46 +0000
+++ phabletutils/environment.py	2013-09-04 12:58:37 +0000
@@ -216,7 +216,7 @@
     return projects.UbuntuTouchSystem(
         file_list=files,
         command_part=command_part,
-        recovery=recovery,
+        device=device,
         backup=args.backup)
 
 

=== modified file 'phabletutils/fileutils.py'
--- phabletutils/fileutils.py	2013-08-22 22:25:37 +0000
+++ phabletutils/fileutils.py	2013-09-04 12:58:37 +0000
@@ -15,9 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import atexit
+import contextlib
 import logging
+import lzma
 import os.path
 import shutil
+import tarfile
 import tempfile
 
 
@@ -48,3 +51,12 @@
             else:
                 raise e
     return directory
+
+
+def lzma_extract_file(lzma_tarfile, file_name):
+    log.info('Decompressing %s from %s' % (file_name, lzma_tarfile))
+    temp_dir = create_temp_dir()
+    with contextlib.closing(lzma.LZMAFile(lzma_tarfile)) as xz:
+        with tarfile.open(fileobj=xz) as tar:
+            tar.extract(member=file_name, path=temp_dir)
+    return os.path.join(temp_dir, file_name)

=== modified file 'phabletutils/projects.py'
--- phabletutils/projects.py	2013-08-24 12:18:07 +0000
+++ phabletutils/projects.py	2013-09-04 12:58:37 +0000
@@ -26,6 +26,7 @@
 from phabletutils.resources import (File, SignedFile)
 from phabletutils import backup
 from phabletutils import downloads
+from phabletutils import fileutils
 from time import sleep
 from textwrap import dedent
 
@@ -218,9 +219,9 @@
         mount system
         ''')
 
-    def __init__(self, file_list, recovery, command_part, backup):
+    def __init__(self, file_list, device, command_part, backup):
         log.debug('UbuntuTouchSystem')
-        super(UbuntuTouchSystem, self).__init__(recovery=recovery, wipe=True)
+        super(UbuntuTouchSystem, self).__init__(wipe=True)
         for item in file_list:
             if item and not isinstance(item, File):
                 raise TypeError('%s is not of type File' % item)
@@ -229,6 +230,11 @@
         self._recovery_list = file_list
         self._command_part = command_part
         self._backup = backup
+        self._device = device
+
+    def _is_device_file(self, entry):
+        f = os.path.basename(entry.path)
+        return f.startswith(self._device) and f.endswith('.xz')
 
     def install(self, adb, fastboot=None):
         """
@@ -250,11 +256,14 @@
                 adb.push(entry.sig_path, '/cache/recovery/')
             except AttributeError:
                 pass
+            if self._is_device_file(entry):
+                recovery_path = fileutils.lzma_extract_file(
+                    entry.path, 'partitions/recovery.img')
         adb.push(self.create_ubuntu_command_file(),
                  '/cache/recovery/ubuntu_command')
         adb.reboot(bootloader=True)
-        fastboot.flash('recovery', self._recovery.path)
-        fastboot.boot(self._recovery.path)
+        fastboot.flash('recovery', recovery_path)
+        fastboot.boot(recovery_path)
         self._loop_until_installed(adb)
         if backup_file:
             log.warning('Restoring from backup')