cmd/snap: use CoreLibExecDir instead of DistroLibExecDir

snapcore · Apr 25, 2017 · 417b113 · 417b113
1 parent b8784b9
commit 417b113
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -91,7 +91,7 @@ func ExecInCoreSnap() {
 	// ensure we do not re-exec into an older version of snapd, look
 	// for info file and ignore version of core that do not yet have
 	// it
-	fullInfo := filepath.Join(corePath, dirs.DistroLibExecDir, "info")
+	fullInfo := filepath.Join(corePath, dirs.CoreLibExecDir, "info")
 	if !osutil.FileExists(fullInfo) {
 		logger.Debugf("not restarting into %q (no version info): older than %q (%s)", full, exe, Version)
 		return

diff --git a/cmd/snap/cmd_run_test.go b/cmd/snap/cmd_run_test.go
@@ -450,7 +450,7 @@ func (s *SnapSuite) TestSnapRunIsReexeced(c *check.C) {
 		readlink string
 		expected bool
 	}{
-		{filepath.Join(dirs.SnapMountDir, dirs.DistroLibExecDir, "snapd"), true},
+		{filepath.Join(dirs.SnapMountDir, dirs.CoreLibExecDir, "snapd"), true},
 		{fmt.Sprintf("%s/snapd", dirs.DistroLibExecDir), false},
 	} {
 		osReadlinkResult = t.readlink