UTAH

Merge lp:~doanac/utah/touch-pixels into lp:utah

  1. touch-pixels
  2. Merge into dev
Proposed by Andy Doan
Status: Merged
Merged at revision: 978
Proposed branch: lp:~doanac/utah/touch-pixels
Merge into: lp:utah
Diff against target: 31 lines (+7/-9)
2 files modified
examples/run_utah_phablet.py (+2/-9)
templates/utah-autopilot.jinja2 (+5/-0)
To merge this branch: bzr merge lp:~doanac/utah/touch-pixels
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+176770@code.launchpad.net

Description of the change

fixes pixel issue in touch images

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/run_utah_phablet.py'
2--- examples/run_utah_phablet.py 2013-07-24 17:12:07 +0000
3+++ examples/run_utah_phablet.py 2013-07-24 19:36:25 +0000
4@@ -132,15 +132,8 @@
5
6 if not env:
7 env = ''
8- buf = [
9- '#!/bin/sh',
10- 'chmod 666 /dev/uinput',
11- 'export $(grep SESSION /home/phablet/.cache/upstart/dbus-session)',
12- 'sudo -i -u phablet {} \\'.format(env),
13- ' DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS autopilot $*',
14- ]
15- device.create_file_ubuntu(
16- '/usr/local/bin/utah-autopilot', '\n'.join(buf), '755')
17+ buf = template.as_buff('utah-autopilot.jinja2', env=env)
18+ device.create_file_ubuntu('/usr/local/bin/utah-autopilot', buf, '755')
19
20
21 def _get_phone_shell_cmds(args):
22
23=== added file 'templates/utah-autopilot.jinja2'
24--- templates/utah-autopilot.jinja2 1970-01-01 00:00:00 +0000
25+++ templates/utah-autopilot.jinja2 2013-07-24 19:36:25 +0000
26@@ -0,0 +1,5 @@
27+#!/bin/sh
28+
29+chmod 666 /dev/uinput
30+sudo -i -u phablet {{env}} bash -ic "autopilot $*"
31+

Subscribers

People subscribed via source and target branches

to all changes: