Minor fixes.pre-refresh-hook

2 files changed, 3 insertions, 4 deletions

diff --git a/overlord/snapstate/snapstate.go b/overlord/snapstate/snapstate.go
index 857e05f7f8..b98510be11 100644
--- a/overlord/snapstate/snapstate.go
+++ b/overlord/snapstate/snapstate.go
@@ -62,7 +62,7 @@ func needsMaybeCore(typ snap.Type) int {
 
 func doInstall(st *state.State, snapst *SnapState, snapsup *SnapSetup, flags int) (*state.TaskSet, error) {
	if snapst.IsInstalled() && !snapst.Active {
-	return nil, fmt.Errorf("cannot update a disabled snap %q", snapsup.Name())
+	return nil, fmt.Errorf("cannot update disabled snap %q", snapsup.Name())
	}
 
	if snapsup.Flags.Classic {
@@ -126,8 +126,6 @@ func doInstall(st *state.State, snapst *SnapState, snapsup *SnapSetup, flags int
	prev = checkAsserts
	}
 
-	runRefreshHooks := (snapst.IsInstalled() && !snapsup.Flags.Revert)
-
	// mount
	if !revisionIsLocal {
	mount := st.NewTask("mount-snap", fmt.Sprintf(i18n.G("Mount snap %q%s"), snapsup.Name(), revisionStr))
@@ -136,6 +134,7 @@ func doInstall(st *state.State, snapst *SnapState, snapsup *SnapSetup, flags int
	}
 
	// run refresh hooks when updating existing snap, otherwise run install hook further down.
+	runRefreshHooks := (snapst.IsInstalled() && !snapsup.Flags.Revert)
	if runRefreshHooks {
	preRefreshHook := SetupPreRefreshHook(st, snapsup.Name())
	addTask(preRefreshHook)
diff --git a/overlord/snapstate/snapstate_test.go b/overlord/snapstate/snapstate_test.go
index cd9048ca1b..1c7e6706b7 100644
--- a/overlord/snapstate/snapstate_test.go
+++ b/overlord/snapstate/snapstate_test.go
@@ -567,7 +567,7 @@ func (s snapmgrTestSuite) TestInstallFailsOnDisabledSnap(c *C) {
	snapsup := &snapstate.SnapSetup{SideInfo: &snap.SideInfo{RealName: "some-snap", SnapID: "some-snap-id", Revision: snap.R(1)}}
	_, err := snapstate.DoInstall(s.state, snapst, snapsup, 0)
	c.Assert(err, NotNil)
-	c.Assert(err, ErrorMatches, `cannot update a disabled snap "some-snap"`)
+	c.Assert(err, ErrorMatches, `cannot update disabled snap "some-snap"`)
 }
 
 func (s *snapmgrTestSuite) TestUpdateCreatesDiscardAfterCurrentTasks(c *C) {