diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/commits snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/commits --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/commits 2024-04-25 12:31:25.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/commits 2024-04-26 12:31:48.000000000 +0000 @@ -1 +1 @@ -master:b0e5e0f10c89f9148e0e19c6d44e7d1ab33875f4 +master:7ac11af2492a0fd8fb6185983bdbc99dc1093938 diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/debian/changelog snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/debian/changelog --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/debian/changelog 2024-04-25 12:31:26.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/debian/changelog 2024-04-26 12:31:48.000000000 +0000 @@ -1,8 +1,8 @@ -snapd (2.62+git5248.5e3257cd0~ubuntu23.10.1) mantic; urgency=low +snapd (2.62+git5250.3b3c011ef~ubuntu23.10.1) mantic; urgency=low * Auto build. - -- Launchpad Package Builder Thu, 25 Apr 2024 12:31:26 +0000 + -- Launchpad Package Builder Fri, 26 Apr 2024 12:31:48 +0000 snapd (2.62) xenial; urgency=medium diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/debian/git-build-recipe.manifest snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/debian/git-build-recipe.manifest --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/debian/git-build-recipe.manifest 2024-04-25 12:31:26.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/debian/git-build-recipe.manifest 2024-04-26 12:31:48.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+git5248.5e3257cd0 -lp:snapd-vendor git-commit:5e3257cd05291826669fdace4a338258fef7dd3f +# git-build-recipe format 0.4 deb-version {debupstream}+git5250.3b3c011ef +lp:snapd-vendor git-commit:3b3c011ef3ef5384c18b57134dce6f2b8c88e9e3 diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/interfaces/apparmor/backend.go snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/interfaces/apparmor/backend.go --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/interfaces/apparmor/backend.go 2024-04-25 12:31:25.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/interfaces/apparmor/backend.go 2024-04-26 12:31:48.000000000 +0000 @@ -54,6 +54,7 @@ "github.com/snapcore/snapd/release" apparmor_sandbox "github.com/snapcore/snapd/sandbox/apparmor" "github.com/snapcore/snapd/snap" + "github.com/snapcore/snapd/snapdenv" "github.com/snapcore/snapd/strutil" "github.com/snapcore/snapd/timings" ) @@ -664,7 +665,9 @@ } return "" default: - // TODO: Warn that an invalid pattern is being used. + if snapdenv.Testing() || osutil.IsTestBinary() { + panic(fmt.Sprintf("cannot expand snippet for pattern %q", placeholder)) + } } return "" }) @@ -966,6 +969,12 @@ } return tagSnippets + default: + if snapdenv.Testing() || osutil.IsTestBinary() { + panic(fmt.Sprintf("cannot expand snippet for pattern %q", placeholder)) + } else { + logger.Noticef("WARNING: cannto expand snippet for pattern %q", placeholder) + } } return "" }) diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/interfaces/apparmor/backend_test.go snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/interfaces/apparmor/backend_test.go --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/interfaces/apparmor/backend_test.go 2024-04-25 12:31:25.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/interfaces/apparmor/backend_test.go 2024-04-26 12:31:48.000000000 +0000 @@ -2418,7 +2418,7 @@ } func (s *backendSuite) TestHomeIxRule(c *C) { - restoreTemplate := apparmor.MockTemplate("template\n###SNIPPETS###\nneedle rwkl###HOME_IX###,\n") + restoreTemplate := apparmor.MockTemplate("template\n###SNIPPETS###\n") defer restoreTemplate() restore := apparmor_sandbox.MockLevel(apparmor_sandbox.Full) defer restore() diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/overlord/snapstate/backend_test.go snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/overlord/snapstate/backend_test.go --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/overlord/snapstate/backend_test.go 2024-04-25 12:31:25.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/overlord/snapstate/backend_test.go 2024-04-26 12:31:48.000000000 +0000 @@ -169,6 +169,8 @@ type fakeStore struct { storetest.Store + mu sync.Mutex + downloads []fakeDownload refreshRevnos map[string]snap.Revision fakeBackend *fakeSnappyBackend @@ -210,6 +212,12 @@ return info, err } +func (f *fakeStore) appendDownload(dl *fakeDownload) { + f.mu.Lock() + defer f.mu.Unlock() + f.downloads = append(f.downloads, *dl) +} + type snapSpec struct { Name string Channel string @@ -675,7 +683,7 @@ } hit = info.Revision } - f.fakeBackend.ops = append(f.fakeBackend.ops, fakeOp{ + f.fakeBackend.appendOp(&fakeOp{ op: "storesvc-snap-action:action", action: *a, revno: hit, @@ -741,7 +749,7 @@ if dlOpts != nil && *dlOpts == (store.DownloadOptions{}) { dlOpts = nil } - f.downloads = append(f.downloads, fakeDownload{ + f.appendDownload(&fakeDownload{ macaroon: macaroon, name: name, target: targetFn, @@ -1340,7 +1348,7 @@ } func (f *fakeSnappyBackend) RemoveSnapDataDir(info *snap.Info, otherInstances bool, opts *dirs.SnapDirOptions) error { - f.ops = append(f.ops, fakeOp{ + f.appendOp(&fakeOp{ op: "remove-snap-data-dir", name: info.InstanceName(), path: snap.BaseDataDir(info.SnapName()), @@ -1350,7 +1358,7 @@ } func (f *fakeSnappyBackend) RemoveContainerMountUnits(s snap.ContainerPlaceInfo, meter progress.Meter) error { - f.ops = append(f.ops, fakeOp{ + f.appendOp(&fakeOp{ op: "remove-snap-mount-units", name: s.ContainerName(), }) @@ -1358,7 +1366,7 @@ } func (f *fakeSnappyBackend) RemoveSnapDir(s snap.PlaceInfo, otherInstances bool) error { - f.ops = append(f.ops, fakeOp{ + f.appendOp(&fakeOp{ op: "remove-snap-dir", name: s.InstanceName(), path: snap.BaseDir(s.SnapName()), diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/packaging/ubuntu-16.04/changelog snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/packaging/ubuntu-16.04/changelog --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/packaging/ubuntu-16.04/changelog 2024-04-25 12:31:26.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/packaging/ubuntu-16.04/changelog 2024-04-26 12:31:48.000000000 +0000 @@ -1,8 +1,8 @@ -snapd (2.62+git5248.5e3257cd0~ubuntu23.10.1) mantic; urgency=low +snapd (2.62+git5250.3b3c011ef~ubuntu23.10.1) mantic; urgency=low * Auto build. - -- Launchpad Package Builder Thu, 25 Apr 2024 12:31:26 +0000 + -- Launchpad Package Builder Fri, 26 Apr 2024 12:31:48 +0000 snapd (2.62) xenial; urgency=medium diff -Nru snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/packaging/ubuntu-16.04/git-build-recipe.manifest snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/packaging/ubuntu-16.04/git-build-recipe.manifest --- snapd-2.62+git5248.5e3257cd0~ubuntu23.10.1/packaging/ubuntu-16.04/git-build-recipe.manifest 2024-04-25 12:31:26.000000000 +0000 +++ snapd-2.62+git5250.3b3c011ef~ubuntu23.10.1/packaging/ubuntu-16.04/git-build-recipe.manifest 2024-04-26 12:31:48.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+git5248.5e3257cd0 -lp:snapd-vendor git-commit:5e3257cd05291826669fdace4a338258fef7dd3f +# git-build-recipe format 0.4 deb-version {debupstream}+git5250.3b3c011ef +lp:snapd-vendor git-commit:3b3c011ef3ef5384c18b57134dce6f2b8c88e9e3