Merge lp:~chipaca/snappy/check-namespaces-on-sideload into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

don't let you sideload something you already have installed

[Michael Vogt (mvo)]

LTGM

review: Approve

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-04-21 10:25:14 +0000
+++ snappy/click.go	2015-04-21 10:25:14 +0000
@@ -866,6 +866,10 @@
 		return "", err
 	}
 
+	if err := m.checkForPackageInstalled(namespace); err != nil {
+		return "", err
+	}
+
 	if err := m.checkForNameClashes(); err != nil {
 		return "", err
 	}

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-04-21 10:25:14 +0000
+++ snappy/click_test.go	2015-04-21 10:25:14 +0000
@@ -170,7 +170,7 @@
 	c.Assert(err, NotNil)
 }
 
-func (s *SnapTestSuite) TestLocalSnapInstall(c *C) {
+func (s *SnapTestSuite) testLocalSnapInstall(c *C) string {
 	snapFile := makeTestSnapPackage(c, "")
 	name, err := installClick(snapFile, 0, nil, testNamespace)
 	c.Assert(err, IsNil)
@@ -194,6 +194,19 @@
 	snap, err := NewInstalledSnapPart(filepath.Join(baseDir, "meta", "package.yaml"), testNamespace)
 	c.Assert(err, IsNil)
 	c.Assert(snap.Hash(), Not(Equals), "")
+
+	return snapFile
+}
+
+func (s *SnapTestSuite) TestLocalSnapInstall(c *C) {
+	s.testLocalSnapInstall(c)
+}
+
+func (s *SnapTestSuite) TestLocalSnapInstallFailsAlreadyInstalled(c *C) {
+	snapFile := s.testLocalSnapInstall(c)
+
+	_, err := installClick(snapFile, 0, nil, "namespaceother")
+	c.Assert(err, Equals, ErrPackageNameAlreadyInstalled)
 }
 
 func (s *SnapTestSuite) TestLocalSnapInstallDebsigVerifyFails(c *C) {

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-04-21 10:25:14 +0000
+++ snappy/snapp.go	2015-04-21 10:25:14 +0000
@@ -326,6 +326,21 @@
 	return nil
 }
 
+func (m *packageYaml) checkForPackageInstalled(namespace string) error {
+	part := ActiveSnapByName(m.Name)
+	if part == nil {
+		return nil
+	}
+
+	if m.Type != SnapTypeFramework {
+		if part.Namespace() != namespace {
+			return ErrPackageNameAlreadyInstalled
+		}
+	}
+
+	return nil
+}
+
 func addCoreFmk(fmks []string) []string {
 	fmkCore := false
 	for _, a := range fmks {

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-04-21 00:41:51 +0000
+++ snappy/snapp_test.go	2015-04-21 10:25:14 +0000
@@ -973,6 +973,42 @@
 	c.Assert(err, Equals, ErrInvalidFrameworkSpecInYaml)
 }
 
+func (s *SnapTestSuite) TestDetectsAlreadyInstalled(c *C) {
+	data := "name: afoo\nversion: 1"
+	yamlPath, err := makeInstalledMockSnap(s.tempdir, data)
+	c.Assert(err, IsNil)
+	c.Assert(makeSnapActive(yamlPath), IsNil)
+
+	yaml, err := parsePackageYamlData([]byte(data))
+	c.Assert(err, IsNil)
+	c.Check(yaml.checkForPackageInstalled("otherns"), Equals, ErrPackageNameAlreadyInstalled)
+}
+
+func (s *SnapTestSuite) TestIgnoresAlreadyInstalledSameNamespace(c *C) {
+	// XXX: should this be allowed? right now it is (=> you can re-sideload the same version of your apps)
+	//      (remote snaps are stopped before clickInstall gets to run)
+
+	data := "name: afoo\nversion: 1"
+	yamlPath, err := makeInstalledMockSnap(s.tempdir, data)
+	c.Assert(err, IsNil)
+	c.Assert(makeSnapActive(yamlPath), IsNil)
+
+	yaml, err := parsePackageYamlData([]byte(data))
+	c.Assert(err, IsNil)
+	c.Check(yaml.checkForPackageInstalled(testNamespace), IsNil)
+}
+
+func (s *SnapTestSuite) TestIgnoresAlreadyInstalledFrameworks(c *C) {
+	data := "name: afoo\nversion: 1\ntype: framework"
+	yamlPath, err := makeInstalledMockSnap(s.tempdir, data)
+	c.Assert(err, IsNil)
+	c.Assert(makeSnapActive(yamlPath), IsNil)
+
+	yaml, err := parsePackageYamlData([]byte(data))
+	c.Assert(err, IsNil)
+	c.Check(yaml.checkForPackageInstalled("otherns"), IsNil)
+}
+
 func (s *SnapTestSuite) TestDetectsNameClash(c *C) {
 	data := []byte(`name: afoo
 version: 1.0