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

[Sergio Schvezov]

Use the AllowOEM installation flag for snappy

[John Lenton (chipaca)]

review: Approve

[lp:~sergiusens/goget-ubuntu-touch/oemFlag]

171. By Sergio Schvezov on 2015-04-21

Use the AllowOEM installation flag for snappy

Unmerged revisions

=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go	2015-04-20 17:04:14 +0000
+++ ubuntu-device-flash/core.go	2015-04-21 18:16:46 +0000
@@ -407,11 +407,7 @@
 	snappy.SetRootDir(systemPath)
 	defer snappy.SetRootDir("/")
 
-	flags := snappy.InhibitHooks
-	if coreCmd.Development.DeveloperMode {
-		flags |= snappy.AllowUnauthenticated
-	}
-
+	flags := coreCmd.installFlags()
 	oemSoftware := coreCmd.oem.OEM.Software
 	packageCount := len(coreCmd.Deprecated.Install) + len(oemSoftware.BuiltIn) + len(oemSoftware.Preinstalled)
 	if coreCmd.Oem != "" {
@@ -523,6 +519,16 @@
 	return string(pubKey), err
 }
 
+func (coreCmd *CoreCmd) installFlags() snappy.InstallFlags {
+	flags := snappy.InhibitHooks | snappy.AllowOEM
+
+	if coreCmd.Development.DeveloperMode {
+		flags |= snappy.AllowUnauthenticated
+	}
+
+	return flags
+}
+
 func (coreCmd *CoreCmd) extractOem(oemPackage string) error {
 	if oemPackage == "" {
 		return nil
@@ -548,11 +554,7 @@
 		Channel: coreCmd.Channel,
 	})
 
-	flags := snappy.InhibitHooks
-	if coreCmd.Development.DeveloperMode {
-		flags |= snappy.AllowUnauthenticated
-	}
-
+	flags := coreCmd.installFlags()
 	pb := progress.NewTextProgress(oemPackage)
 	if _, err := snappy.Install(oemPackage, flags, pb); err != nil {
 		return err