Merge lp:~gcollura/phablet-tools/fix-1373779 into lp:phablet-tools

Proposed by Giulio Collura
Status: Merged
Approved by: Oliver Grawert
Approved revision: 321
Merged at revision: 327
Proposed branch: lp:~gcollura/phablet-tools/fix-1373779
Merge into: lp:phablet-tools
Diff against target: 39 lines (+2/-8)
1 file modified
phablet-demo-setup (+2/-8)
To merge this branch: bzr merge lp:~gcollura/phablet-tools/fix-1373779
Reviewer Review Type Date Requested Status
Oliver Grawert Approve
Review via email: mp+235936@code.launchpad.net

Commit message

fix phablet-demo-setup

Description of the change

I removed adb.root() since it's not supported and phablet login in the addresses setup part.

To post a comment you must log in.
Revision history for this message
Oliver Grawert (ogra) wrote :

i think the chrown below the address book setup isn't needed either anymore ...

Revision history for this message
Giulio Collura (gcollura) wrote :

> i think the chrown below the address book setup isn't needed either anymore
> ...

Does this apply to the other chown too?

321. By Giulio Collura

Remove all chown commands, which are not required anymore.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Worked great for me on a Nexus 7 (2013) and Nexus 10 yesterday. Thanks.

Revision history for this message
Oliver Grawert (ogra) 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 'phablet-demo-setup'
2--- phablet-demo-setup 2014-07-03 17:40:24 +0000
3+++ phablet-demo-setup 2014-09-25 11:28:30 +0000
4@@ -80,33 +80,27 @@
5 def setup_fake_pictures(script):
6 script.write('tar -C /home/phablet/Pictures/ --strip-components=1 -xzf '
7 '/tmp/pictures.tgz\n')
8- script.write('chown -R phablet:phablet /home/phablet/Pictures\n')
9 return script
10
11
12 def setup_fake_contacts(script):
13 script.write('tar -C /home/phablet -xzf /tmp/contacts.tgz \n')
14- script.write(' su - phablet '
15- '-c "/home/phablet/.local/bin/manage-address-books create"\n')
16- script.write('chown -R phablet:phablet /home/phablet/.local \n')
17+ script.write('/home/phablet/.local/bin/manage-address-books create \n')
18 return script
19
20
21 def setup_fake_conversations(script):
22 script.write('tar -C /home/phablet -xzf /tmp/conversations.tgz \n')
23- script.write('chown -R phablet:phablet /home/phablet/.local \n')
24 return script
25
26
27 def provision_device(adb, serial, script):
28 script_dst = '/tmp/provision'
29- adb.root()
30 adb.push(script, script_dst)
31 adb.chmod(script_dst, '700')
32- adb.shell('sh /tmp/provision')
33+ adb.shell('sh ' + script_dst)
34 log.info('Getting ready to restart')
35 adb.shell('sync')
36- adb.reboot()
37
38
39 def main(args):

Subscribers

People subscribed via source and target branches