Merge lp:~sil2100/goget-ubuntu-touch/touch-devel-warning into lp:goget-ubuntu-touch

Proposed by Łukasz Zemczak on 2016-01-08
Status: Merged
Approved by: Łukasz Zemczak on 2016-06-13
Approved revision: 221
Merged at revision: 228
Proposed branch: lp:~sil2100/goget-ubuntu-touch/touch-devel-warning
Merge into: lp:goget-ubuntu-touch
Diff against target: 24 lines (+6/-1)
1 file modified
ubuntu-device-flash/touch.go (+6/-1)
To merge this branch: bzr merge lp:~sil2100/goget-ubuntu-touch/touch-devel-warning
Reviewer Review Type Date Requested Status
Michael Vogt 2016-01-08 Approve on 2016-01-25
Review via email: mp+282045@code.launchpad.net

Commit message

Add a warning label for devel channel usage in touch, change the default channel to stable/ubuntu.

Description of the change

Add a warning label for devel channel usage in touch, change the default channel to stable/ubuntu.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Looks good!

review: Approve
Łukasz Zemczak (sil2100) wrote :

Thanks! Could we get this merged in? :)

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 2015-02-10 05:51:08 +0000
3+++ ubuntu-device-flash/touch.go 2016-01-08 18:37:15 +0000
4@@ -40,7 +40,7 @@
5 CustomTarball string `long:"custom-tarball" description:"Specify a local custom tarball to override the one from the server (using official Ubuntu images with different custom tarballs)"`
6 RunScript string `long:"run-script" description:"Run a script given by path to finish the flashing process, instead of rebooting to recovery (mostly used during development to work around quirky or incomplete recovery images)"`
7 Password string `long:"password" description:"This sets up the default password for the phablet user. This option is meant for CI and not general use"`
8- Channel string `long:"channel" description:"Specify the channel to use" default:"ubuntu-touch/stable"`
9+ Channel string `long:"channel" description:"Specify the channel to use" default:"ubuntu-touch/stable/ubuntu"`
10 Device string `long:"device" description:"Specify the device to flash"`
11 RecoveryImage string `long:"recovery-image" description:"Specify the recovery image file to use when flashing, overriding the one from the device tarball (useful if the latter has no adb enabled)"`
12 fastboot devices.Fastboot
13@@ -87,6 +87,11 @@
14 fmt.Println("WARNING --developer-mode and --password are dangerous as they remove security features from your device")
15 }
16
17+ // print out a conditional warning for devel* channel usage
18+ if strings.HasPrefix(touchCmd.Channel, "ubuntu-touch/devel") {
19+ fmt.Println("WARNING You are about to flash your phone with a development image - continue at your own risk! There is absolutely no guarantee that even the most basic phone functions will work.")
20+ }
21+
22 var deviceTarballPath string
23 if touchCmd.DeviceTarball != "" {
24 p, err := expandFile(touchCmd.DeviceTarball)

Subscribers

People subscribed via source and target branches