Merge lp:~canonical-ci-engineering/goget-ubuntu-touch/local_image into lp:goget-ubuntu-touch

[Celso Providelo]

Unmerged revisions

175. By Joe Talbott on 2015-05-15

u-d-f - Actually use the local image part.

174. By Joe Talbott on 2015-05-15

u-d-f - Add --image-part option for local rootfs image.

=== modified file 'ubuntu-device-flash/common.go'
--- ubuntu-device-flash/common.go	2015-03-30 03:28:28 +0000
+++ ubuntu-device-flash/common.go	2015-05-28 22:28:04 +0000
@@ -84,6 +84,11 @@
 	return strings.Contains(path, "device")
 }
 
+// isImagePart checks if the file corresponds to the image part.
+func isImagePart(path string) bool {
+	return strings.Contains(path, "ubuntu-")
+}
+
 // isCustomPart checks if the file corresponds to the custom part.
 func isCustomPart(path string) bool {
 	return strings.Contains(path, "custom")

=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go	2015-05-01 13:31:58 +0000
+++ ubuntu-device-flash/core.go	2015-05-28 22:28:04 +0000
@@ -60,6 +60,7 @@
 
 	Development struct {
 		DevicePart    string `long:"device-part" description:"Specify a local device part to override the one from the server"`
+                ImagePart     string `long:"image-part" description:"Specify a local image part to override the one from the server"`
 		DeveloperMode bool   `long:"developer-mode" description:"Finds the latest public key in your ~/.ssh and sets it up using cloud-init"`
 		EnableSsh     bool   `long:"enable-ssh" description:"Enable ssh on the image through cloud-init(not needed with developer mode)"`
 	} `group:"Development"`
@@ -111,6 +112,16 @@
 		devicePart = p
 	}
 
+	var imagePart string
+	if coreCmd.Development.ImagePart != "" {
+		p, err := expandFile(coreCmd.Development.ImagePart)
+		if err != nil {
+			return err
+		}
+
+		imagePart = p
+	}
+
 	fmt.Println("Determining oem configuration")
 	if err := coreCmd.extractOem(coreCmd.Oem); err != nil {
 		return err
@@ -180,7 +191,7 @@
 				devicePart = f.FilePath
 
 				if hardware, err := extractHWDescription(f.FilePath); err != nil {
-					fmt.Println("Failed to read harware.yaml from device part, provisioning may fail:", err)
+					fmt.Println("Failed to read hardware.yaml from device part, provisioning may fail:", err)
 				} else {
 					hwChan <- hardware
 				}
@@ -196,7 +207,10 @@
 		if devicePart != "" && isDevicePart(f.Path) {
 			printOut("Using a custom device tarball")
 			filesChan <- Files{FilePath: devicePart}
-		} else {
+		} else if imagePart != "" && isImagePart(f.Path) {
+			printOut("Using a custom image tarball")
+			filesChan <- Files{FilePath: imagePart}
+		}else {
 			go bitDownloader(f, filesChan, globalArgs.Server, cacheDir)
 		}
 	}
@@ -427,7 +441,7 @@
 	for _, snap := range packageQueue {
 		fmt.Println("Installing", snap)
 
-		pb := progress.NewTextProgress(snap)
+		pb := progress.NewTextProgress()
 		if _, err := snappy.Install(snap, flags, pb); err != nil {
 			return err
 		}
@@ -557,7 +571,7 @@
 	})
 
 	flags := coreCmd.installFlags()
-	pb := progress.NewTextProgress(oemPackage)
+	pb := progress.NewTextProgress()
 	if _, err := snappy.Install(oemPackage, flags, pb); err != nil {
 		return err
 	}