snap, s/snaptest: fix bug following symlink to component and update u…

…nit test to match real behavior
canonical · May 15, 2024 · 6cd4807 · 6cd4807
1 parent 5573bfd
commit 6cd4807
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/snap/info.go b/snap/info.go
@@ -1564,7 +1564,7 @@ func ReadCurrentComponentInfo(component string, info *Info, container func(strin
 		return nil, fmt.Errorf("cannot read revision %s: %s", rev, err)
 	}
 
-	cont, err := container(linkSource)
+	cont, err := container(link)
 	if err != nil {
 		return nil, err
 	}

diff --git a/snap/snaptest/snaptest.go b/snap/snaptest/snaptest.go
@@ -146,7 +146,10 @@ func MockComponentCurrent(c *check.C, yamlText string, info *snap.Info, csi snap
 	err := os.MkdirAll(filepath.Dir(link), 0755)
 	c.Assert(err, check.IsNil)
 
-	err = os.Symlink(mountDir, link)
+	linkDest, err := filepath.Rel(filepath.Dir(link), mountDir)
+	c.Assert(err, check.IsNil)
+
+	err = osutil.AtomicSymlink(linkDest, link)
 	c.Assert(err, check.IsNil)
 
 	return ci