Merge lp:~doanac/utah/remove-FLIPPED into lp:utah

[Andy Doan]

removes the FLIPPED logic as this has now become the default method in touch images

[Paul Larson (pwlars)]

review: Approve

=== modified file 'examples/run_utah_phablet.py'
--- examples/run_utah_phablet.py	2013-07-02 20:32:20 +0000
+++ examples/run_utah_phablet.py	2013-07-03 19:59:27 +0000
@@ -19,7 +19,6 @@
 from __future__ import print_function
 
 import argparse
-import datetime
 import os
 import socket
 import subprocess
@@ -33,7 +32,6 @@
 from utah import template
 
 CLIENT_PROBES_DIR = '/tmp/utah-probes'
-FLIPPED = os.environ.get('FLIPPED', False)
 
 
 def phablet_tools_errors(f):
@@ -56,8 +54,6 @@
         cmd.extend(['-r', args.revision])
     if args.uri:
         cmd.extend(['-u', args.uri])
-    if FLIPPED:
-        cmd.extend(['--flipped'])
     if args.device:
         cmd.extend(['-d', args.device])
 
@@ -69,14 +65,6 @@
     device.adb_root()
     device.wait_for_device()
     print()
-    if not FLIPPED:
-        # make the utah-client and jenkins job happy by printing and setting
-        # a build-date for this
-        d = device.run_android('getprop ro.build.date.utc').strip()
-        d = datetime.date.fromtimestamp(int(d)).strftime('%Y%m%d')
-        print('= setting build_id to {}'.format(d))
-        d = '({})'.format(d)
-        device.create_file_ubuntu('/var/log/installer/media-info', d)
 
 
 @phablet_tools_errors
@@ -324,7 +312,7 @@
     if args.env:
         args.utah_cmd = '{} {}'.format(args.env, args.utah_cmd)
 
-    if not args.skip_install and device.flipped() and not args.device:
+    if not args.skip_install and not args.device and not device.detect_type():
         print('ERROR: --device option required for provisioning')
         sys.exit(1)
 

=== modified file 'utah/provisioning/touch.py'
--- utah/provisioning/touch.py	2013-07-01 21:58:02 +0000
+++ utah/provisioning/touch.py	2013-07-03 19:59:27 +0000
@@ -17,7 +17,6 @@
 
 import atexit
 import contextlib
-import os
 import sys
 import subprocess
 import tempfile
@@ -26,8 +25,6 @@
 
 import utah.process as process
 
-FLIPPED = os.environ.get('FLIPPED', False)
-
 
 class ADBShellError(Exception):
 
@@ -108,9 +105,6 @@
         :rtype: string
 
         """
-        if not FLIPPED:
-            path = 'PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin'
-            cmd = 'chroot /data/ubuntu /usr/bin/env -i {} {}'.format(path, cmd)
         return self._adb_shell(cmd)
 
     def run_android(self, cmd, stream=True):
@@ -120,26 +114,20 @@
         :rtype: string
 
         """
-        if FLIPPED:
-            cmd = 'android-chroot {}'.format(cmd)
+        cmd = 'android-chroot {}'.format(cmd)
         return self._adb_shell(cmd, stream)
 
-    def flipped(self):
-        """determine whether or not Ubuntu is the primary os."""
-        try:
-            self._adb_shell('which android-chroot', stream=False)
-        except ADBShellError:
-            return False
-        return True
-
-    def _ubuntu_path(self, path):
-        if FLIPPED:
-            return path
-        return '/data/ubuntu{}'.format(path)
+    def detect_type(self):
+        """determine the device type."""
+        device = self._adb_shell('getprop ro.cm.device', stream=False).strip()
+        # Check Android property
+        if not device:
+            device = self._adb_shell(
+                'getprop ro.product.device', stream=False).strip()
+        return device
 
     def create_file_ubuntu(self, pathname, contents, mode=None):
         """Create a file in the ubuntu file system."""
-        pathname = self._ubuntu_path(pathname)
         with tempfile.NamedTemporaryFile() as f:
             f.write(contents)
             f.flush()
@@ -149,7 +137,6 @@
 
     def get_file_ubuntu(self, tgt_file, dst_dir):
         """Copy a file from the ubuntu file system to host directory."""
-        tgt_file = self._ubuntu_path(tgt_file)
         self._adb_operation(['pull', tgt_file, dst_dir])
 
     @contextlib.contextmanager
@@ -158,8 +145,7 @@
         cmd = ['adb']
         if self._serial:
             cmd.extend(['-s', self._serial])
-        cmd.extend(
-            ['shell', 'tail', '-f', self._ubuntu_path('/var/log/syslog')])
+        cmd.extend(['shell', 'tail', '-f', '/var/log/syslog'])
         p = subprocess.Popen(cmd)
         atexit.register(p.terminate)  # incase _chrooted ends in an error
         try: