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

[John Lenton]

Make unsetActiveClick a method of SnapPart.

[Sergio Schvezov (sergiusens)]

looks good, just a teeny itsy bitsy comment

[lp:~chipaca/snappy/unsetActiveClick]

484. By John Lenton on 2015-05-29

Merged setActiveClick into unsetActiveClick.

485. By John Lenton on 2015-06-08

Merged setActiveClick into unsetActiveClick.

486. By John Lenton on 2015-06-08

Merged setActiveClick into unsetActiveClick.

487. By John Lenton on 2015-06-08

Merged setActiveClick into unsetActiveClick.

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-06-08 18:59:15 +0000
+++ snappy/click.go	2015-06-08 18:59:15 +0000
@@ -45,7 +45,6 @@
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/pkg"
-	"launchpad.net/snappy/policy"
 	"launchpad.net/snappy/progress"
 	"launchpad.net/snappy/systemd"
 
@@ -812,60 +811,6 @@
 	return nil
 }
 
-func unsetActiveClick(clickDir string, inhibitHooks bool, inter interacter) error {
-	currentSymlink := filepath.Join(clickDir, "..", "current")
-
-	// sanity check
-	currentActiveDir, err := filepath.EvalSymlinks(currentSymlink)
-	if err != nil {
-		return err
-	}
-	if clickDir != currentActiveDir {
-		return ErrSnapNotActive
-	}
-
-	// remove generated services, binaries, clickHooks, security policy
-	if err := removePackageBinaries(clickDir); err != nil {
-		return err
-	}
-
-	if err := removePackageServices(clickDir, inter); err != nil {
-		return err
-	}
-
-	m, err := parsePackageYamlFile(filepath.Join(clickDir, "meta", "package.yaml"))
-	if err != nil {
-		return err
-	}
-
-	if err := m.removeSecurityPolicy(clickDir); err != nil {
-		return err
-	}
-
-	manifest, err := readClickManifestFromClickDir(clickDir)
-	if err != nil {
-		return err
-	}
-
-	if manifest.Type == pkg.TypeFramework {
-
-		if err := policy.Remove(m.Name, clickDir); err != nil {
-			return err
-		}
-	}
-
-	if err := removeClickHooks(m, originFromBasedir(clickDir), inhibitHooks); err != nil {
-		return err
-	}
-
-	// and finally the current symlink
-	if err := os.Remove(currentSymlink); err != nil {
-		logger.Noticef("Failed to remove %q: %v", currentSymlink, err)
-	}
-
-	return nil
-}
-
 // RunHooks will run all click system hooks
 func RunHooks() error {
 	systemHooks, err := systemClickHooks()

=== modified file 'snappy/parts_test.go'
--- snappy/parts_test.go	2015-06-08 18:59:15 +0000
+++ snappy/parts_test.go	2015-06-08 18:59:15 +0000
@@ -133,7 +133,7 @@
 	c.Assert(part.activate(true, ag), IsNil)
 
 	c.Check(PackageNameActive("hello-app"), Equals, true)
-	c.Assert(unsetActiveClick(pkgdir, true, ag), IsNil)
+	c.Assert(part.deactivate(true, ag), IsNil)
 	c.Check(PackageNameActive("hello-app"), Equals, false)
 }
 

=== modified file 'snappy/purge.go'
--- snappy/purge.go	2015-06-08 18:59:15 +0000
+++ snappy/purge.go	2015-06-08 18:59:15 +0000
@@ -65,7 +65,7 @@
 	}
 
 	for i, pkg := range active {
-		err := unsetActiveClick(pkg.basedir, false, meter)
+		err := pkg.deactivate(false, meter)
 		if err != nil {
 			meter.Notify(fmt.Sprintf("Unable to deactivate %s: %s", pkg.Name(), err))
 			meter.Notify("Purge continues.")

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-06-08 18:59:15 +0000
+++ snappy/snapp.go	2015-06-08 18:59:15 +0000
@@ -729,7 +729,7 @@
 	// otherwise just create a empty data dir
 	if oldPart != nil {
 		// we need to stop making it active
-		err = unsetActiveClick(oldPart.basedir, inhibitHooks, inter)
+		err = oldPart.deactivate(inhibitHooks, inter)
 		defer func() {
 			if err != nil {
 				if cerr := oldPart.activate(inhibitHooks, inter); cerr != nil {
@@ -847,7 +847,15 @@
 
 	// there is already an active part
 	if currentActiveDir != "" {
-		unsetActiveClick(currentActiveDir, inhibitHooks, inter)
+		// TODO: support switching origins
+		oldYaml := filepath.Join(currentActiveDir, "meta", "package.yaml")
+		oldPart, err := NewInstalledSnapPart(oldYaml, s.origin)
+		if err != nil {
+			return err
+		}
+		if err := oldPart.deactivate(inhibitHooks, inter); err != nil {
+			return err
+		}
 	}
 
 	if s.Type() == pkg.TypeFramework {
@@ -884,6 +892,52 @@
 	return os.Symlink(filepath.Base(s.basedir), currentActiveSymlink)
 }
 
+func (s *SnapPart) deactivate(inhibitHooks bool, inter interacter) error {
+	currentSymlink := filepath.Join(s.basedir, "..", "current")
+
+	// sanity check
+	currentActiveDir, err := filepath.EvalSymlinks(currentSymlink)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return ErrSnapNotActive
+		}
+		return err
+	}
+	if s.basedir != currentActiveDir {
+		return ErrSnapNotActive
+	}
+
+	// remove generated services, binaries, clickHooks, security policy
+	if err := removePackageBinaries(s.basedir); err != nil {
+		return err
+	}
+
+	if err := removePackageServices(s.basedir, inter); err != nil {
+		return err
+	}
+
+	if err := s.m.removeSecurityPolicy(s.basedir); err != nil {
+		return err
+	}
+
+	if s.Type() == pkg.TypeFramework {
+		if err := policy.Remove(s.Name(), s.basedir); err != nil {
+			return err
+		}
+	}
+
+	if err := removeClickHooks(s.m, s.origin, inhibitHooks); err != nil {
+		return err
+	}
+
+	// and finally the current symlink
+	if err := os.Remove(currentSymlink); err != nil {
+		logger.Noticef("Failed to remove %q: %v", currentSymlink, err)
+	}
+
+	return nil
+}
+
 // Uninstall remove the snap from the system
 func (s *SnapPart) Uninstall(pb progress.Meter) (err error) {
 	// OEM snaps should not be removed as they are a key
@@ -920,14 +974,8 @@
 		return err
 	}
 
-	// remove "current" symlink if it points to this SnapPart
-	// (i.e. if this was the active version).
-	currentSymlink := filepath.Join(filepath.Dir(s.basedir), "current")
-	p, _ := filepath.EvalSymlinks(currentSymlink)
-	if s.basedir == p {
-		if err := unsetActiveClick(p, false, inter); err != nil {
-			return err
-		}
+	if err := s.deactivate(false, inter); err != nil && err != ErrSnapNotActive {
+		return err
 	}
 
 	err = os.RemoveAll(s.basedir)