osutil: mergeusr: don't rewrite /usr/sbin to /usr/bin (MR 58)

Alpine TSC decided to keep /usr/sbin for now, so let's not break paths
to stuff under /usr/sbin in the meantime.
This commit is contained in:
Clayton Craft
2024-11-13 00:35:16 -08:00
parent 4d7dd79bcf
commit 4e771ab96f
2 changed files with 2 additions and 7 deletions

View File

@@ -40,11 +40,6 @@ func MergeUsr(file string) string {
}
}
// Convert /usr/sbin --> /usr/bin
if part, found := strings.CutPrefix(file, "/usr/sbin"); found {
file = filepath.Join("/usr/bin/", part)
}
return file
}

View File

@@ -18,11 +18,11 @@ func TestMergeUsr(t *testing.T) {
},
{
in: "/sbin/foo",
expected: "/usr/bin/foo",
expected: "/usr/sbin/foo",
},
{
in: "/usr/sbin/foo",
expected: "/usr/bin/foo",
expected: "/usr/sbin/foo",
},
{
in: "/usr/bin/foo",