Merge lp:~sergiusens/snapweb/oemBrokeFix into lp:~snappy-dev/snapweb/trunk

[Sergio Schvezov]

Fix broken oem package detection (removing more code along the way).

[John Lenton (chipaca)]

review: Approve

=== modified file 'cmd/snappyd/handlers.go'
--- cmd/snappyd/handlers.go	2015-05-03 20:42:50 +0000
+++ cmd/snappyd/handlers.go	2015-05-08 19:24:12 +0000
@@ -86,7 +86,6 @@
 	if err != nil && err != oem.ErrNotFound {
 		return f, err
 	} else if err != oem.ErrNotFound {
-		fmt.Println(pkg)
 		name = pkg.Branding.Name
 		subname = pkg.Branding.Subname
 	}

=== removed file 'oem/handlers.go'
--- oem/handlers.go	2015-05-03 20:41:25 +0000
+++ oem/handlers.go	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Canonical Ltd
- *
- * 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 warranty of
- * MERCHANTABILITY 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/>.
- *
- */
-
-package oem
-
-import (
-	"os"
-	"path/filepath"
-)
-
-func glob(dir string, filename string) (pkgs []string, err error) {
-	err = filepath.Walk(dir, func(path string, f os.FileInfo, err error) error {
-		if filepath.Base(path) == filename {
-			pkgs = append(pkgs, path)
-		}
-
-		return nil
-	})
-
-	return pkgs, err
-}

=== modified file 'oem/oem.go'
--- oem/oem.go	2015-05-03 20:41:25 +0000
+++ oem/oem.go	2015-05-08 19:24:12 +0000
@@ -20,6 +20,9 @@
 import (
 	"errors"
 	"io/ioutil"
+	"path/filepath"
+
+	"launchpad.net/snappy/snappy"
 
 	"gopkg.in/yaml.v2"
 )
@@ -52,23 +55,26 @@
 var ErrDecode = errors.New("decoding problem")
 
 // Oem returns an oem package
-func Oem() (pkg Snap, err error) {
-	pkgs, err := glob("/oem/", "package.yaml")
-
-	if len(pkgs) == 0 {
-		return pkg, ErrNotFound
-	} else if len(pkgs) > 1 || err != nil {
-		return pkg, ErrTooMany
-	}
-
-	f, err := ioutil.ReadFile(pkgs[0])
-	if err != nil {
-		return pkg, ErrDecode
-	}
-
+func Oem() (*Snap, error) {
+	oem, err := snappy.ActiveSnapsByType(snappy.SnapTypeOem)
+	if err != nil {
+		return nil, err
+	} else if len(oem) > 1 {
+		return nil, ErrTooMany
+	} else if len(oem) == 0 {
+		return nil, ErrNotFound
+	}
+
+	yamlPath := filepath.Join("/oem", oem[0].Name(), oem[0].Version(), "meta", "package.yaml")
+	f, err := ioutil.ReadFile(yamlPath)
+	if err != nil {
+		return nil, ErrDecode
+	}
+
+	var pkg Snap
 	if err := yaml.Unmarshal([]byte(f), &pkg); err != nil {
-		return pkg, ErrDecode
+		return nil, ErrDecode
 	}
 
-	return pkg, nil
+	return &pkg, nil
 }

=== modified file 'pkg/meta/package.yaml'
--- pkg/meta/package.yaml	2015-05-07 21:53:39 +0000
+++ pkg/meta/package.yaml	2015-05-08 19:24:12 +0000
@@ -3,7 +3,7 @@
 icon: meta/webdm-icon.png
 source: lp:webdm
 type: framework
-version: 0.6
+version: 0.6.1
 architecture: UNKNOWN_ARCH
 services:
     - name: snappyd