Merge lp:~chipaca/snappy/reduce-manifest into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Keep the use of clickManifest to a minimum (use packagYaml instead). Also misc cleanups.

This cuts down on usage of clickManifest, which is now only used from places that need to read or write to it directly. This means it can be an internal detail.

As a nice side effect, it's now painfully obvious which things should actually be methods on SnapPart: if it gets a packageYaml and a namespace, it should be using a SnapPart instead.

Also: random drive-by cleanups.

[lp:~chipaca/snappy/reduce-manifest]

465. By John Lenton on 2015-05-19

keep the use of clickManifest to a minimum (use packagYaml instead)

[Michael Vogt (mvo)]

Thanks for the branch and the cleanup, really nice. I added some inline comments/questions/kudos.

[lp:~chipaca/snappy/reduce-manifest]

466. By John Lenton on 2015-05-20

qualifiedName, not dirname. Also renamed tests.

[Michael Vogt (mvo)]

I like "qualifiedName"! Thanks a lot for this change!

review: Approve

=== modified file 'pkg/types.go'
--- pkg/types.go	2015-05-19 11:13:06 +0000
+++ pkg/types.go	2015-05-20 09:49:44 +0000
@@ -1,3 +1,5 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
 /*
  * Copyright (C) 2014-2015 Canonical Ltd
  *

=== modified file 'pkg/types_test.go'
--- pkg/types_test.go	2015-05-19 11:13:06 +0000
+++ pkg/types_test.go	2015-05-20 09:49:44 +0000
@@ -1,3 +1,5 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
 /*
  * Copyright (C) 2014-2015 Canonical Ltd
  *

=== modified file 'snappy/build_test.go'
--- snappy/build_test.go	2015-05-15 13:33:27 +0000
+++ snappy/build_test.go	2015-05-20 09:49:44 +0000
@@ -462,8 +462,6 @@
 	readFiles, err := exec.Command("dpkg-deb", "-c", "hello_1.0.1_all.snap").CombinedOutput()
 	c.Assert(err, IsNil)
 
-	println(string(readFiles))
-
 	// check that we really have the right perms
 	c.Assert(strings.Contains(string(readFiles), `drwxrwxrwx`), Equals, true)
 	c.Assert(strings.Contains(string(readFiles), `-rw-rw-rw-`), Equals, true)

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-05-19 17:32:01 +0000
+++ snappy/click.go	2015-05-20 09:49:44 +0000
@@ -181,13 +181,13 @@
 
 // iterHooks will run the callback "f" for the given manifest
 // so that the call back can arrange e.g. a new link
-func iterHooks(manifest clickManifest, inhibitHooks bool, f iterHooksFunc) error {
+func iterHooks(m *packageYaml, namespace string, inhibitHooks bool, f iterHooksFunc) error {
 	systemHooks, err := systemClickHooks()
 	if err != nil {
 		return err
 	}
 
-	for app, hook := range manifest.Hooks {
+	for app, hook := range m.Integration {
 		for hookName, hookSourceFile := range hook {
 			// ignore hooks that only exist for compatibility
 			// with the old snappy-python (like bin-path,
@@ -202,7 +202,7 @@
 				continue
 			}
 
-			dst := filepath.Join(globalRootDir, expandHookPattern(manifest.Name, app, manifest.Version, systemHook.pattern))
+			dst := filepath.Join(globalRootDir, expandHookPattern(m.qualifiedName(namespace), app, m.Version, systemHook.pattern))
 
 			if _, err := os.Stat(dst); err == nil {
 				if err := os.Remove(dst); err != nil {
@@ -227,8 +227,8 @@
 	return nil
 }
 
-func installClickHooks(targetDir string, manifest clickManifest, inhibitHooks bool) error {
-	return iterHooks(manifest, inhibitHooks, func(src, dst string, systemHook clickHook) error {
+func installClickHooks(targetDir string, m *packageYaml, namespace string, inhibitHooks bool) error {
+	return iterHooks(m, namespace, inhibitHooks, func(src, dst string, systemHook clickHook) error {
 		// setup the new link target here, iterHooks will take
 		// care of running the hook
 		realSrc := stripGlobalRootDir(path.Join(targetDir, src))
@@ -240,8 +240,8 @@
 	})
 }
 
-func removeClickHooks(manifest clickManifest, inhibitHooks bool) (err error) {
-	return iterHooks(manifest, inhibitHooks, func(src, dst string, systemHook clickHook) error {
+func removeClickHooks(m *packageYaml, namespace string, inhibitHooks bool) (err error) {
+	return iterHooks(m, namespace, inhibitHooks, func(src, dst string, systemHook clickHook) error {
 		// nothing we need to do here, the iterHookss will remove
 		// the hook symlink and call the hook itself
 		return nil
@@ -262,12 +262,12 @@
 }
 
 func removeClick(clickDir string, inter interacter) (err error) {
-	manifest, err := readClickManifestFromClickDir(clickDir)
+	m, err := parsePackageYamlFile(filepath.Join(clickDir, "meta", "package.yaml"))
 	if err != nil {
 		return err
 	}
 
-	if err := removeClickHooks(manifest, false); err != nil {
+	if err := removeClickHooks(m, namespaceFromBasedir(clickDir), false); err != nil {
 		return err
 	}
 
@@ -367,17 +367,14 @@
 `
 
 	// it's fine for this to error out; we might be in a framework or sth
-	namespace, _ := namespaceFromYamlPath(filepath.Join(pkgPath, "meta", "package.yaml"))
+	namespace := namespaceFromBasedir(pkgPath)
 
 	if err := verifyBinariesYaml(binary); err != nil {
 		return "", err
 	}
 
 	actualBinPath := binPathForBinary(pkgPath, binary)
-	udevPartName, err := getUdevPartName(m, pkgPath)
-	if err != nil {
-		return "", err
-	}
+	udevPartName := m.qualifiedName(namespace)
 
 	var templateOut bytes.Buffer
 	t := template.Must(template.New("wrapper").Parse(wrapperTemplate))
@@ -455,10 +452,7 @@
 		return "", err
 	}
 
-	udevPartName, err := getUdevPartName(m, baseDir)
-	if err != nil {
-		return "", err
-	}
+	udevPartName := m.qualifiedName(namespaceFromBasedir(baseDir))
 
 	return systemd.New(globalRootDir, nil).GenServiceFile(
 		&systemd.ServiceDescription{
@@ -835,11 +829,6 @@
 		return "", err
 	}
 
-	manifest, err := readClickManifest([]byte(manifestData))
-	if err != nil {
-		return "", err
-	}
-
 	yamlData, err := d.MetaMember("package.yaml")
 	if err != nil {
 		return "", err
@@ -864,15 +853,14 @@
 
 	targetDir := snapAppsDir
 	// the "oem" parts are special
-	if manifest.Type == pkg.TypeOem {
+	if m.Type == pkg.TypeOem {
 		targetDir = snapOemDir
 
 		// TODO do the following at a higher level once the store publishes snap types
 		// this is horrible
 		if allowOEM := (flags & AllowOEM) != 0; !allowOEM {
 			if currentOEM, err := getOem(); err == nil {
-				if currentOEM.Name != manifest.Name {
-					fmt.Println(currentOEM.Name, manifest.Name)
+				if currentOEM.Name != m.Name {
 					return "", ErrOEMPackageInstall
 				}
 			} else {
@@ -886,19 +874,15 @@
 		}
 	}
 
-	fullName := manifest.Name
-	// namespacing only applies to apps.
-	if manifest.Type != pkg.TypeFramework && manifest.Type != pkg.TypeOem {
-		fullName += "." + namespace
-	}
-	instDir := filepath.Join(targetDir, fullName, manifest.Version)
+	fullName := m.qualifiedName(namespace)
+	instDir := filepath.Join(targetDir, fullName, m.Version)
 	currentActiveDir, _ := filepath.EvalSymlinks(filepath.Join(instDir, "..", "current"))
 
 	if err := m.checkLicenseAgreement(inter, d, currentActiveDir); err != nil {
 		return "", err
 	}
 
-	dataDir := filepath.Join(snapDataDir, fullName, manifest.Version)
+	dataDir := filepath.Join(snapDataDir, fullName, m.Version)
 
 	if err := helpers.EnsureDir(instDir, 0755); err != nil {
 		logger.Noticef("Can not create %q: %v", instDir, err)
@@ -944,7 +928,7 @@
 	//
 	// otherwise just create a empty data dir
 	if currentActiveDir != "" {
-		oldManifest, err := readClickManifestFromClickDir(currentActiveDir)
+		oldM, err := parsePackageYamlFile(filepath.Join(currentActiveDir, "meta", "package.yaml"))
 		if err != nil {
 			return "", err
 		}
@@ -962,15 +946,15 @@
 			return "", err
 		}
 
-		err = copySnapData(fullName, oldManifest.Version, manifest.Version)
+		err = copySnapData(fullName, oldM.Version, m.Version)
 	} else {
 		err = helpers.EnsureDir(dataDir, 0755)
 	}
 
 	defer func() {
 		if err != nil {
-			if cerr := removeSnapData(fullName, manifest.Version); cerr != nil {
-				logger.Noticef("When cleaning up data for %s %s: %v", manifest.Name, manifest.Version, cerr)
+			if cerr := removeSnapData(fullName, m.Version); cerr != nil {
+				logger.Noticef("When cleaning up data for %s %s: %v", m.Name, m.Version, cerr)
 			}
 		}
 	}()
@@ -984,7 +968,7 @@
 	defer func() {
 		if err != nil && currentActiveDir != "" {
 			if cerr := setActiveClick(currentActiveDir, inhibitHooks, inter); cerr != nil {
-				logger.Noticef("When setting old %s version back to active: %v", manifest.Name, cerr)
+				logger.Noticef("When setting old %s version back to active: %v", m.Name, cerr)
 			}
 		}
 	}()
@@ -1054,7 +1038,7 @@
 		}
 	}
 
-	return manifest.Name, nil
+	return m.Name, nil
 }
 
 // removeSnapData removes the data for the given version of the given snap
@@ -1152,6 +1136,7 @@
 	if err != nil {
 		return err
 	}
+
 	if err := m.removeSecurityPolicy(clickDir); err != nil {
 		return err
 	}
@@ -1168,7 +1153,7 @@
 		}
 	}
 
-	if err := removeClickHooks(manifest, inhibitHooks); err != nil {
+	if err := removeClickHooks(m, namespaceFromBasedir(clickDir), inhibitHooks); err != nil {
 		return err
 	}
 
@@ -1207,15 +1192,17 @@
 		return err
 	}
 
+	namespace := namespaceFromBasedir(baseDir)
+
 	if newActiveManifest.Type == pkg.TypeFramework {
 		if err := policy.Install(m.Name, baseDir); err != nil {
 			return err
 		}
 	}
 
-	if err := installClickHooks(baseDir, newActiveManifest, inhibitHooks); err != nil {
+	if err := installClickHooks(baseDir, m, namespace, inhibitHooks); err != nil {
 		// cleanup the failed hooks
-		removeClickHooks(newActiveManifest, inhibitHooks)
+		removeClickHooks(m, namespace, inhibitHooks)
 		return err
 	}
 

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-05-19 17:32:01 +0000
+++ snappy/click_test.go	2015-05-20 09:49:44 +0000
@@ -141,26 +141,26 @@
 	os.MkdirAll(instDir, 0755)
 	ioutil.WriteFile(path.Join(instDir, "path-to-systemd-file"), []byte(""), 0644)
 	ioutil.WriteFile(path.Join(instDir, "path-to-apparmor-file"), []byte(""), 0644)
-	manifest := clickManifest{
+	m := &packageYaml{
 		Name:    "foo",
 		Version: "1.0",
-		Hooks: map[string]clickAppHook{
+		Integration: map[string]clickAppHook{
 			"app": clickAppHook{
 				"systemd":  "path-to-systemd-file",
 				"apparmor": "path-to-apparmor-file",
 			},
 		},
 	}
-	err := installClickHooks(instDir, manifest, false)
+	err := installClickHooks(instDir, m, testNamespace, false)
 	c.Assert(err, IsNil)
-	p := fmt.Sprintf("%s/%s_%s_%s", testSymlinkDir, manifest.Name, "app", manifest.Version)
+	p := fmt.Sprintf("%s/%s.%s_%s_%s", testSymlinkDir, m.Name, testNamespace, "app", m.Version)
 	_, err = os.Stat(p)
 	c.Assert(err, IsNil)
 	symlinkTarget, err := filepath.EvalSymlinks(p)
 	c.Assert(err, IsNil)
 	c.Assert(symlinkTarget, Equals, path.Join(instDir, "path-to-systemd-file"))
 
-	p = fmt.Sprintf("%s/%s_%s_%s", testSymlinkDir2, manifest.Name, "app", manifest.Version)
+	p = fmt.Sprintf("%s/%s.%s_%s_%s", testSymlinkDir2, m.Name, testNamespace, "app", m.Version)
 	_, err = os.Stat(p)
 	c.Assert(err, IsNil)
 	symlinkTarget, err = filepath.EvalSymlinks(p)
@@ -168,9 +168,9 @@
 	c.Assert(symlinkTarget, Equals, path.Join(instDir, "path-to-apparmor-file"))
 
 	// now ensure we can remove
-	err = removeClickHooks(manifest, false)
+	err = removeClickHooks(m, testNamespace, false)
 	c.Assert(err, IsNil)
-	_, err = os.Stat(fmt.Sprintf("%s/%s_%s_%s", testSymlinkDir, manifest.Name, "app", manifest.Version))
+	_, err = os.Stat(fmt.Sprintf("%s/%s.%s_%s_%s", testSymlinkDir, m.Name, testNamespace, "app", m.Version))
 	c.Assert(err, NotNil)
 }
 
@@ -1383,10 +1383,10 @@
 	makeClickHook(c, content)
 	os.MkdirAll(path.Join(s.tempdir, "/var/lib/systemd/click/"), 0755)
 
-	manifest := clickManifest{
+	m := &packageYaml{
 		Name:    "foo",
 		Version: "1.0",
-		Hooks: map[string]clickAppHook{
+		Integration: map[string]clickAppHook{
 			"app": clickAppHook{
 				"systemd": "path-to-systemd-file",
 			},
@@ -1399,7 +1399,7 @@
 		return s
 	}
 
-	err := installClickHooks(c.MkDir(), manifest, false)
+	err := installClickHooks(c.MkDir(), m, testNamespace, false)
 	c.Assert(err, IsNil)
 	c.Assert(stripGlobalRootDirWasCalled, Equals, true)
 }

=== modified file 'snappy/config.go'
--- snappy/config.go	2015-05-15 13:33:27 +0000
+++ snappy/config.go	2015-05-20 09:49:44 +0000
@@ -47,7 +47,7 @@
 		return "", ErrPackageNotFound
 	}
 
-	name := Dirname(part)
+	name := QualifiedName(part)
 	appArmorProfile := fmt.Sprintf("%s_%s_%s", name, "snappy-config", part.Version())
 
 	return runConfigScript(configScript, appArmorProfile, rawConfig, makeSnapHookEnv(part))

=== modified file 'snappy/datadir.go'
--- snappy/datadir.go	2015-05-15 13:33:27 +0000
+++ snappy/datadir.go	2015-05-20 09:49:44 +0000
@@ -32,8 +32,8 @@
 	Version   string
 }
 
-// Dirname returns the filesystem directory name for this SnapDataDir
-func (dd SnapDataDir) Dirname() string {
+// QualifiedName returns the filesystem directory name for this SnapDataDir
+func (dd SnapDataDir) QualifiedName() string {
 	if dd.Namespace != "" {
 		return dd.Name + "." + dd.Namespace
 	}

=== modified file 'snappy/datadir_test.go'
--- snappy/datadir_test.go	2015-05-15 13:33:27 +0000
+++ snappy/datadir_test.go	2015-05-20 09:49:44 +0000
@@ -115,7 +115,7 @@
 	})
 }
 
-func (s *DataDirSuite) TestDataDirDirname(c *C) {
-	c.Check(SnapDataDir{Name: "foo", Namespace: "bar"}.Dirname(), Equals, "foo.bar")
-	c.Check(SnapDataDir{Name: "foo"}.Dirname(), Equals, "foo")
+func (s *DataDirSuite) TestDataDirQualifiedName(c *C) {
+	c.Check(SnapDataDir{Name: "foo", Namespace: "bar"}.QualifiedName(), Equals, "foo.bar")
+	c.Check(SnapDataDir{Name: "foo"}.QualifiedName(), Equals, "foo")
 }

=== modified file 'snappy/install.go'
--- snappy/install.go	2015-05-19 14:09:19 +0000
+++ snappy/install.go	2015-05-20 09:49:44 +0000
@@ -107,7 +107,7 @@
 	}
 
 	for _, part := range found {
-		cur := FindSnapsByNameAndVersion(Dirname(part), part.Version(), installed)
+		cur := FindSnapsByNameAndVersion(QualifiedName(part), part.Version(), installed)
 		if len(cur) != 0 {
 			return "", ErrAlreadyInstalled
 		}

=== modified file 'snappy/install_test.go'
--- snappy/install_test.go	2015-05-15 13:33:27 +0000
+++ snappy/install_test.go	2015-05-20 09:49:44 +0000
@@ -118,6 +118,7 @@
 			io.WriteString(w, `{
 "package_name": "foo",
 "version": "2",
+"origin": "test",
 "anon_download_url": "`+dlURL+`"
 }`)
 		case "/dl":

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-05-19 17:32:01 +0000
+++ snappy/parts.go	2015-05-20 09:49:44 +0000
@@ -43,9 +43,9 @@
 	OemConfig() SystemConfig
 }
 
-// Dirname of a Part is the Name, in most cases qualified with the
+// QualifiedName of a Part is the Name, in most cases qualified with the
 // Namespace
-func Dirname(p Part) string {
+func QualifiedName(p Part) string {
 	if t := p.Type(); t == pkg.TypeFramework || t == pkg.TypeOem {
 		return p.Name()
 	}

=== modified file 'snappy/purge.go'
--- snappy/purge.go	2015-05-15 13:33:27 +0000
+++ snappy/purge.go	2015-05-20 09:49:44 +0000
@@ -50,7 +50,7 @@
 	var active []*SnapPart
 
 	for _, datadir := range datadirs {
-		yamlPath := filepath.Join(snapAppsDir, datadir.Dirname(), datadir.Version, "meta", "package.yaml")
+		yamlPath := filepath.Join(snapAppsDir, datadir.QualifiedName(), datadir.Version, "meta", "package.yaml")
 		part, err := NewInstalledSnapPart(yamlPath, datadir.Namespace)
 		if err != nil {
 			// no such part installed
@@ -74,9 +74,9 @@
 	}
 
 	for _, datadir := range datadirs {
-		if err := remove(datadir.Dirname(), datadir.Version); err != nil {
+		if err := remove(datadir.QualifiedName(), datadir.Version); err != nil {
 			e = err
-			meter.Notify(fmt.Sprintf("unable to purge %s version %s: %s", datadir.Dirname(), datadir.Version, err.Error()))
+			meter.Notify(fmt.Sprintf("unable to purge %s version %s: %s", datadir.QualifiedName(), datadir.Version, err.Error()))
 		}
 	}
 

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-05-19 17:32:01 +0000
+++ snappy/snapp.go	2015-05-20 09:49:44 +0000
@@ -326,6 +326,13 @@
 	return &m, nil
 }
 
+func (m *packageYaml) qualifiedName(namespace string) string {
+	if m.Type == pkg.TypeFramework || m.Type == pkg.TypeOem {
+		return m.Name
+	}
+	return m.Name + "." + namespace
+}
+
 func (m *packageYaml) checkForNameClashes() error {
 	d := make(map[string]struct{})
 	for _, bin := range m.Binaries {
@@ -637,7 +644,7 @@
 		return err
 	}
 
-	return RemoveAllHWAccess(Dirname(s))
+	return RemoveAllHWAccess(QualifiedName(s))
 }
 
 // Config is used to to configure the snap
@@ -721,7 +728,7 @@
 // symlinks (thus requesting aaClickHookCmd regenerate the appropriate bits).
 func (s *SnapPart) RequestAppArmorUpdate(policies, templates map[string]bool) error {
 
-	fullName := Dirname(s)
+	fullName := QualifiedName(s)
 	for _, svc := range s.Services() {
 		if svc.NeedsAppArmorUpdate(policies, templates) {
 			if err := updateAppArmorJSONTimestamp(fullName, svc.Name, s.Version()); err != nil {
@@ -857,14 +864,23 @@
 	return parts, nil
 }
 
+func namespaceFromBasedir(basedir string) (s string) {
+	ext := filepath.Ext(filepath.Dir(filepath.Clean(basedir)))
+	if len(ext) < 2 {
+		return ""
+	}
+
+	return ext[1:]
+}
+
 func namespaceFromYamlPath(path string) (string, error) {
-	namespace := filepath.Ext(filepath.Dir(filepath.Join(path, "..", "..")))
+	namespace := namespaceFromBasedir(filepath.Join(path, "..", ".."))
 
-	if len(namespace) < 1 {
+	if namespace == "" {
 		return "", ErrInvalidPart
 	}
 
-	return namespace[1:], nil
+	return namespace, nil
 }
 
 // RemoteSnapPart represents a snap available on the server
@@ -1298,7 +1314,7 @@
 	snapEnv := map[string]string{
 		"SNAP_NAME":          part.Name(),
 		"SNAP_ORIGIN":        part.Namespace(),
-		"SNAP_FULLNAME":      Dirname(part),
+		"SNAP_FULLNAME":      QualifiedName(part),
 		"SNAP_VERSION":       part.Version(),
 		"SNAP_APP_PATH":      part.basedir,
 		"SNAP_APP_DATA_PATH": snapDataDir,

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-05-19 17:32:01 +0000
+++ snappy/snapp_test.go	2015-05-20 09:49:44 +0000
@@ -692,6 +692,7 @@
 
 	snap := RemoteSnapPart{}
 	snap.pkg.AnonDownloadURL = mockServer.URL + "/snap"
+	snap.pkg.Namespace = testNamespace
 
 	p := &MockProgressMeter{}
 	name, err := snap.Install(p, 0)
@@ -1386,3 +1387,28 @@
 	c.Assert(cmds[1], DeepEquals, aCmd{"udevadm", "trigger"})
 	c.Assert(cmds, HasLen, 2)
 }
+
+func (s *SnapTestSuite) TestQualifiedNameName(c *C) {
+	packageYaml, err := parsePackageYamlData([]byte(`name: foo
+version: 1.0
+icon: foo.svg
+vendor: Foo Bar <[e-mail]>
+`))
+	c.Assert(err, IsNil)
+
+	udevName := packageYaml.qualifiedName("mvo")
+	c.Assert(udevName, Equals, "foo.mvo")
+}
+
+func (s *SnapTestSuite) TestQualifiedNameNameFramework(c *C) {
+	packageYaml, err := parsePackageYamlData([]byte(`name: foo
+version: 1.0
+icon: foo.svg
+type: framework
+vendor: Foo Bar <[e-mail]>
+`))
+	c.Assert(err, IsNil)
+
+	udevName := packageYaml.qualifiedName("")
+	c.Assert(udevName, Equals, "foo")
+}

=== removed file 'snappy/udev.go'
--- snappy/udev.go	2015-05-19 17:32:01 +0000
+++ snappy/udev.go	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-// -*- Mode: Go; indent-tabs-mode: t -*-
-
-/*
- * 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 snappy
-
-import (
-	"fmt"
-	"path/filepath"
-
-	"launchpad.net/snappy/pkg"
-)
-
-func getUdevPartName(m *packageYaml, baseDir string) (string, error) {
-	if m.Type == pkg.TypeFramework || m.Type == pkg.TypeOem {
-		return m.Name, nil
-	}
-
-	namespace, err := namespaceFromYamlPath(filepath.Join(baseDir, "meta", "package.yaml"))
-
-	return fmt.Sprintf("%s.%s", m.Name, namespace), err
-
-}

=== removed file 'snappy/udev_test.go'
--- snappy/udev_test.go	2015-05-15 13:33:27 +0000
+++ snappy/udev_test.go	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-// -*- Mode: Go; indent-tabs-mode: t -*-
-
-/*
- * 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 snappy
-
-import (
-	. "launchpad.net/gocheck"
-)
-
-func (s *SnapTestSuite) TestGetUdevPartName(c *C) {
-	packageYaml, err := parsePackageYamlData([]byte(`name: foo
-version: 1.0
-icon: foo.svg
-vendor: Foo Bar <[e-mail]>
-`))
-	c.Assert(err, IsNil)
-
-	udevName, err := getUdevPartName(packageYaml, "/apps/foo.mvo/1.0/")
-	c.Assert(err, IsNil)
-	c.Assert(udevName, Equals, "foo.mvo")
-}
-
-func (s *SnapTestSuite) TestGetUdevPartNameFramework(c *C) {
-	packageYaml, err := parsePackageYamlData([]byte(`name: foo
-version: 1.0
-icon: foo.svg
-type: framework
-vendor: Foo Bar <[e-mail]>
-`))
-	c.Assert(err, IsNil)
-
-	udevName, err := getUdevPartName(packageYaml, "/apps/foo/1.0/")
-	c.Assert(err, IsNil)
-	c.Assert(udevName, Equals, "foo")
-}