Merge lp:~binli/goget-ubuntu-touch/refine-turbo-bootstrap-support into lp:~morphis/goget-ubuntu-touch/add-turbo-bootstrap-support

Proposed by Bin Li on 2016-06-02
Status: Merged
Approved by: Simon Fels on 2016-06-02
Approved revision: 230
Merged at revision: 230
Proposed branch: lp:~binli/goget-ubuntu-touch/refine-turbo-bootstrap-support
Merge into: lp:~morphis/goget-ubuntu-touch/add-turbo-bootstrap-support
Diff against target: 17 lines (+5/-2)
1 file modified
ubuntu-device-flash/touch.go (+5/-2)
To merge this branch: bzr merge lp:~binli/goget-ubuntu-touch/refine-turbo-bootstrap-support
Reviewer Review Type Date Requested Status
Simon Fels 2016-06-02 Approve on 2016-06-02
Alex Tu 2016-06-02 Pending
Review via email: mp+296282@code.launchpad.net

Description of the change

clean the /cache directory.

To post a comment you must log in.
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-device-flash/touch.go'
2--- ubuntu-device-flash/touch.go 2016-05-03 16:01:17 +0000
3+++ ubuntu-device-flash/touch.go 2016-06-02 04:58:22 +0000
4@@ -360,8 +360,11 @@
5 if err := adb.Ping(); err != nil {
6 log.Fatal("Target device cannot be reached over adb")
7 }
8- if _, err := adb.Shell("rm -rf /cache/recovery/*.xz /cache/recovery/*.xz.asc"); err != nil {
9- log.Fatal("Cannot cleanup /cache/recovery/ to ensure clean deployment", err)
10+ if _, err := adb.Shell("rm -rf /cache/*"); err != nil {
11+ log.Fatal("Cannot cleanup /cache/ to ensure clean deployment", err)
12+ }
13+ if _, err := adb.Shell("mkdir /cache/recovery/"); err != nil {
14+ log.Fatal("Cannot create /cache/recovery to ensure clean deployment", err)
15 }
16 for {
17 file := <-files

Subscribers

People subscribed via source and target branches

to all changes: