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

[Sergio Schvezov]

Removing dead code, moving ubuntu_stamp retrieval and minor fixes to flashing plain android.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/96

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

141 - adb.reboot(bootloader=True)

You shouldn't remove this line, otherwise flash will fail when using -b as it'll stop waiting for the device to respond (fastboot).

review: Needs Fixing

[lp:~sergiusens/phablet-tools/android]

179. By Sergio Schvezov on 2013-09-05

Adding back reboot bootloader command for bootstrapping.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/97

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good.

review: Approve

=== modified file 'phabletutils/device.py'
--- phabletutils/device.py	2013-08-13 02:15:17 +0000
+++ phabletutils/device.py	2013-09-05 14:35:54 +0000
@@ -92,7 +92,7 @@
 
     def chown(self, user, path):
         '''Performs a chmod on target device.'''
-        cmd = 'shell chown -R %s %s' % (user, path)
+        cmd = 'shell chown -R %s:%s %s' % (user, user, path)
         call(self._cmd % cmd)
 
     def getprop(self, android_property):

=== modified file 'phabletutils/downloads.py'
--- phabletutils/downloads.py	2013-08-14 02:37:08 +0000
+++ phabletutils/downloads.py	2013-09-05 14:35:54 +0000
@@ -134,3 +134,24 @@
         return None
     else:
         return content_request.content
+
+
+def get_ubuntu_stamp(uri):
+    '''Downloads the jenkins build id from stamp file'''
+    try:
+        ubuntu_stamp = requests.get('%s/quantal-ubuntu_stamp' % uri)
+        if ubuntu_stamp.status_code != 200:
+            ubuntu_stamp = requests.get('%s/ubuntu_stamp' % uri)
+        if ubuntu_stamp.status_code != 200:
+            log.error('Latest build detection not supported... bailing')
+            exit(1)
+        # Make list and get rid of empties
+        build_data = filter(lambda x: x.startswith('JENKINS_BUILD='),
+                            ubuntu_stamp.content.split('\n'))
+        jenkins_build_id = build_data[0].split('=')[1]
+    except (requests.HTTPError, requests.Timeout, requests.ConnectionError):
+        log.error('Could not download build data from jenkins... bailing')
+        exit(1)
+    except IndexError:
+        raise EnvironmentError('Jenkins data format has changed, incompatible')
+    return jenkins_build_id

=== modified file 'phabletutils/environment.py'
--- phabletutils/environment.py	2013-09-04 01:14:52 +0000
+++ phabletutils/environment.py	2013-09-05 14:35:54 +0000
@@ -19,7 +19,6 @@
 import hashlib
 import logging
 import os.path
-import requests
 
 from phabletutils.device import AndroidBridge
 from phabletutils import cdimage
@@ -34,27 +33,6 @@
 log = logging.getLogger()
 
 
-def get_ubuntu_stamp(uri):
-    '''Downloads the jenkins build id from stamp file'''
-    try:
-        ubuntu_stamp = requests.get('%s/quantal-ubuntu_stamp' % uri)
-        if ubuntu_stamp.status_code != 200:
-            ubuntu_stamp = requests.get('%s/ubuntu_stamp' % uri)
-        if ubuntu_stamp.status_code != 200:
-            log.error('Latest build detection not supported... bailing')
-            exit(1)
-        # Make list and get rid of empties
-        build_data = filter(lambda x: x.startswith('JENKINS_BUILD='),
-                            ubuntu_stamp.content.split('\n'))
-        jenkins_build_id = build_data[0].split('=')[1]
-    except (requests.HTTPError, requests.Timeout, requests.ConnectionError):
-        log.error('Could not download build data from jenkins... bailing')
-        exit(1)
-    except IndexError:
-        raise EnvironmentError('Jenkins data format has changed, incompatible')
-    return jenkins_build_id
-
-
 def detect_device(serial, device=None):
     '''If no argument passed determine them from the connected device.'''
     # Check CyanogenMod property
@@ -72,37 +50,6 @@
     return device
 
 
-#def setup_revision1(device, uri, download_dir, settings):
-#    if not uri:
-#        uri = settings.download_uri
-#    if not download_dir:
-#        build = get_ubuntu_stamp(uri)
-#        download_dir = get_full_path(
-#            os.path.join(settings.download_dir, build))
-#        setup_download_directory(download_dir)
-#    else:
-#        uri = None
-#    system = settings.device_file_img % device
-#    boot = settings.boot_file_img % (device,)
-#    hash_dict = {entry: load_hash(uri, '%s.md5sum' % entry, download_dir)
-#              for entry in (system, boot)}
-#    if uri:
-#        system_uri = '%s/%s' % (uri, system),
-#        boot_uri = '%s/%s' % (uri, boot),
-#    else:
-#        system_uri = None
-#        boot_uri = None
-#    system_file = resources.File(file_path=os.path.join(download_dir, system),
-#                                 file_uri=system_uri,
-#                                 file_hash=hashes[system],
-#                                 file_hash_func=hashlib.md5)
-#    boot_file = resources.File(file_path=os.path.join(download_dir, boot),
-#                               file_uri=boot_uri,
-#                               file_hash=hashes[boot],
-#                               file_hash_func=hashlib.md5)
-#    return projects.Android(boot=boot_file, system=system_file)
-
-
 def setup_cdimage_files(project_name, uri, download_dir, series,
                         device, legacy=False):
     downloads.setup_download_directory(download_dir)

=== modified file 'phabletutils/projects.py'
--- phabletutils/projects.py	2013-09-04 12:56:38 +0000
+++ phabletutils/projects.py	2013-09-05 14:35:54 +0000
@@ -128,9 +128,10 @@
         super(Android, self).__init__(boot=boot, system=system)
 
     def install(self, adb, fastboot):
+        adb.reboot(bootloader=True)
         log.warning('Device needs to be unlocked for the following to work')
-        fastboot.flash('system', gunzip(self.system))
-        fastboot.flash('boot', self.boot)
+        fastboot.flash('system', gunzip(self._system.path))
+        fastboot.flash('boot', self._boot.path)
         log.info('Installation will complete soon and reboot into Android')
         fastboot.reboot()