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

[Łukasz Zemczak]

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

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

[Michael Vogt (mvo)]

Looks good!

review: Approve

[Łukasz Zemczak (sil2100)]

Thanks! Could we get this merged in? :)

=== modified file 'ubuntu-device-flash/touch.go'
--- ubuntu-device-flash/touch.go	2015-02-10 05:51:08 +0000
+++ ubuntu-device-flash/touch.go	2016-01-08 18:37:15 +0000
@@ -40,7 +40,7 @@
 	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)"`
 	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)"`
 	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"`
-	Channel       string `long:"channel" description:"Specify the channel to use" default:"ubuntu-touch/stable"`
+	Channel       string `long:"channel" description:"Specify the channel to use" default:"ubuntu-touch/stable/ubuntu"`
 	Device        string `long:"device" description:"Specify the device to flash"`
 	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)"`
 	fastboot      devices.Fastboot
@@ -87,6 +87,11 @@
 		fmt.Println("WARNING --developer-mode and --password are dangerous as they remove security features from your device")
 	}
 
+	// print out a conditional warning for devel* channel usage
+	if strings.HasPrefix(touchCmd.Channel, "ubuntu-touch/devel") {
+		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.")
+	}
+
 	var deviceTarballPath string
 	if touchCmd.DeviceTarball != "" {
 		p, err := expandFile(touchCmd.DeviceTarball)