Merge lp:~sergiusens/goget-ubuntu-touch/clean into lp:goget-ubuntu-touch

[Sergio Schvezov]

Simple cleanup option for flashing.

This is a quick way of getting a cleanup option in place. Take a look at answering proposals in
https://bugs.launchpad.net/phablet-tools/+bug/1157710/comments/4

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good.

alan@deep-thought:/tmp$ df -h
Filesystem Size Used Avail Use% Mounted on
/dev/sdb1 231G 33G 197G 15% /
none 4.0K 0 4.0K 0% /sys/fs/cgroup
udev 7.8G 4.0K 7.8G 1% /dev
tmpfs 1.6G 1.7M 1.6G 1% /run
none 5.0M 0 5.0M 0% /run/lock
none 7.8G 44M 7.8G 1% /run/shm
none 100M 128K 100M 1% /run/user
/dev/sda1 224G 176G 48G 79% /home
/home/alan/.Private 224G 176G 48G 79% /home/alan
alan@deep-thought:/tmp$ ubuntu-device-flash --help
Usage:
  ubuntu-device-flash [OPTIONS]

Application Options:
      --revision= revision to flash, absolute or relative allowed
      --bootstrap bootstrap the system, do this from the bootloader
      --list-channels List available channels
      --wipe Clear all data after flashing
      --channel= Specify an alternate channel (stable)
      --device= Specify the device to flash
      --serial= Serial of the device to operate
      --server= Use a different image server (https://system-image.ubuntu.com)
      --clean-cache Cleans up cache with all downloaded bits

Help Options:
  -h, --help Show this help message

alan@deep-thought:/tmp$ ubuntu-device-flash --clean-cache
2014/03/10 17:59:27 Cleaning prevously downloaded content
alan@deep-thought:/tmp$ df -h
Filesystem Size Used Avail Use% Mounted on
/dev/sdb1 231G 33G 197G 15% /
none 4.0K 0 4.0K 0% /sys/fs/cgroup
udev 7.8G 4.0K 7.8G 1% /dev
tmpfs 1.6G 1.7M 1.6G 1% /run
none 5.0M 0 5.0M 0% /run/lock
none 7.8G 44M 7.8G 1% /run/shm
none 100M 128K 100M 1% /run/user
/dev/sda1 224G 171G 52G 77% /home
/home/alan/.Private 224G 171G 52G 77% /home/alan

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/20/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

alan@deep-thought:~$ du -hs .cache/ubuntuimages/
1.5G .cache/ubuntuimages/
alan@deep-thought:~$ ubuntu-device-flash --clean-cache
2014/03/17 22:44:59 Cleaning prevously downloaded content
alan@deep-thought:~$ du -hs .cache/ubuntuimages/
du: cannot access ‘.cache/ubuntuimages/’: No such file or directory

review: Approve

=== modified file 'ubuntu-device-flash/args.go'
--- ubuntu-device-flash/args.go	2014-02-19 15:17:00 +0000
+++ ubuntu-device-flash/args.go	2014-03-10 17:42:58 +0000
@@ -33,6 +33,7 @@
 	Device       string `long:"device" description:"Specify the device to flash"`
 	Serial       string `long:"serial" description:"Serial of the device to operate"`
 	Server       string `long:"server" description:"Use a different image server"`
+	CleanCache   bool   `long:"clean-cache" description:"Cleans up cache with all downloaded bits"`
 }
 
 var args arguments

=== modified file 'ubuntu-device-flash/main.go'
--- ubuntu-device-flash/main.go	2014-02-26 12:40:51 +0000
+++ ubuntu-device-flash/main.go	2014-03-10 17:42:58 +0000
@@ -40,6 +40,13 @@
 		os.Exit(1)
 	}
 	cacheDir := ubuntuimage.GetCacheDir()
+	if args.CleanCache {
+		log.Print("Cleaning prevously downloaded content")
+		if err := os.RemoveAll(cacheDir); err != nil {
+			log.Fatal(err)
+		}
+		return
+	}
 	adb, err := devices.NewUbuntuDebugBridge()
 	var fastboot devices.Fastboot
 	if err != nil {
@@ -272,4 +279,3 @@
 
 	return rpipe
 }
-