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

[Sergio Schvezov]

Update to the sideload bandwagon

[John Lenton (chipaca)]

review: Approve

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'diskimage/common.go'
--- diskimage/common.go	2015-04-16 22:59:21 +0000
+++ diskimage/common.go	2015-04-16 22:59:21 +0000
@@ -8,6 +8,7 @@
 package diskimage
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -108,8 +109,17 @@
 	Config map[string]interface{} `yaml:"config,omitempty"`
 }
 
-func (o OemDescription) InstallPath() string {
-	return filepath.Join("/oem", o.Name, o.Version)
+func (o OemDescription) InstallPath(rootPath string) (string, error) {
+	glob, err := filepath.Glob(fmt.Sprintf("/%s/oem/%s.*/%s", rootPath, o.Name, o.Version))
+	if err != nil {
+		return "", err
+	}
+
+	if len(glob) != 1 {
+		return "", errors.New("oem package not installed")
+	}
+
+	return glob[0], nil
 }
 
 func (o OemDescription) Architecture() string {
 
=== added file 'diskimage/common_test.go'
--- diskimage/common_test.go	1970-01-01 00:00:00 +0000
+++ diskimage/common_test.go	2015-04-16 22:59:21 +0000
@@ -0,0 +1,62 @@
+//
+// diskimage - handles ubuntu disk images
+//
+// Copyright (c) 2015 Canonical Ltd.
+//
+// Written by Sergio Schvezov <[e-mail]>
+//
+package diskimage
+
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License version 3, as published
+// by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranties of
+// MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+// PURPOSE.  See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	. "launchpad.net/gocheck"
+)
+
+type CommonTestSuite struct {
+	tmpdir      string
+	oem         OemDescription
+	packageInst string
+}
+
+var _ = Suite(&CommonTestSuite{})
+
+func (s *CommonTestSuite) SetUpTest(c *C) {
+	s.tmpdir = c.MkDir()
+	s.oem = OemDescription{Name: "packagename", Version: "42"}
+	s.packageInst = fmt.Sprintf("%s.%s", s.oem.Name, "sideload")
+}
+
+func (s *CommonTestSuite) TestOemInstallPath(c *C) {
+	err := os.MkdirAll(filepath.Join(s.tmpdir, "oem", s.packageInst, s.oem.Version), 0755)
+	c.Assert(err, IsNil)
+
+	installPath, err := s.oem.InstallPath(s.tmpdir)
+
+	c.Assert(err, IsNil)
+	c.Assert(installPath, Equals, filepath.Join(s.tmpdir, "/oem/packagename.sideload/42"))
+}
+
+func (s *CommonTestSuite) TestOemInstallPathNoOem(c *C) {
+	err := os.MkdirAll(filepath.Join(s.tmpdir, "oem", s.packageInst), 0755)
+	c.Assert(err, IsNil)
+
+	installPath, err := s.oem.InstallPath(s.tmpdir)
+
+	c.Assert(err, NotNil)
+	c.Assert(installPath, Equals, "")
+}
 
=== modified file 'diskimage/core_uboot.go'
--- diskimage/core_uboot.go	2015-04-01 19:07:26 +0000
+++ diskimage/core_uboot.go	2015-04-16 22:59:21 +0000
@@ -404,7 +404,12 @@
 	// if there is a specific dtb for the platform, copy it.
 	// First look in oem and then in device.
 	if oemDtb := img.oem.OEM.Hardware.Dtb; oemDtb != "" && img.oem.Platform() != "" {
-		oemDtb := filepath.Join(img.System(), img.oem.InstallPath(), oemDtb)
+		oemInstallPath, err := img.oem.InstallPath(img.System())
+		if err != nil {
+			return err
+		}
+
+		oemDtb := filepath.Join(oemInstallPath, oemDtb)
 		dst := filepath.Join(bootDtbPath, filepath.Base(dtb))
 		if err := sysutils.CopyFile(oemDtb, dst); err != nil {
 			return err
 
=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go	2015-04-16 22:59:21 +0000
+++ ubuntu-device-flash/core.go	2015-04-16 22:59:21 +0000
@@ -285,7 +285,11 @@
 		return err
 	}
 
-	oemRootPath := filepath.Join(coreCmd.stagingRootPath, coreCmd.oem.InstallPath())
+	oemRootPath, err := coreCmd.oem.InstallPath(coreCmd.stagingRootPath)
+	if err != nil {
+		return err
+	}
+
 	if err := img.FlashExtra(oemRootPath, devicePart); err != nil {
 		return err
 	}
@@ -361,7 +365,11 @@
 		return err
 	}
 
-	oemRootPath := filepath.Join(coreCmd.stagingRootPath, coreCmd.oem.InstallPath())
+	oemRootPath, err := coreCmd.oem.InstallPath(coreCmd.stagingRootPath)
+	if err != nil {
+		return err
+	}
+
 	if err := img.SetupBoot(oemRootPath); err != nil {
 		return err
 	}