Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into tests/upgrade-os-…
Browse files Browse the repository at this point in the history 
…no-gc
  • Loading branch information
@mvo5
mvo5 committed Nov 18, 2016
2 parents 304524d + d54f41a commit e4fbc27
Show file tree
Hide file tree
Showing 178 changed files with 2,693 additions and 625 deletions.
4 changes: 2 additions & 2 deletions overlord/assertstate/testkeys.go → asserts/sysdb/testkeys.go
View file
Expand Up @@ -18,13 +18,13 @@
* *
*/ */


package assertstate package sysdb


import ( import (
"github.com/snapcore/snapd/asserts/systestkeys" "github.com/snapcore/snapd/asserts/systestkeys"
) )


// init will inject the test trusted assertions when this module build tag "withtestkeys" is defined. // init will inject the test trusted assertions when this module build tag "withtestkeys" is defined.
func init() { func init() {
systestkeys.Inject() InjectTrusted(systestkeys.Trusted)
} }
9 changes: 3 additions & 6 deletions asserts/systestkeys/trusted.go
View file
Expand Up @@ -24,7 +24,6 @@ import (
"fmt" "fmt"


"github.com/snapcore/snapd/asserts" "github.com/snapcore/snapd/asserts"
"github.com/snapcore/snapd/asserts/sysdb"
) )


const ( const (
Expand Down Expand Up @@ -239,6 +238,8 @@ var (
TestRootAccountKey asserts.Assertion TestRootAccountKey asserts.Assertion
// here for convenience, does not need to be in the trusted set // here for convenience, does not need to be in the trusted set
TestStoreAccountKey asserts.Assertion TestStoreAccountKey asserts.Assertion
// Testing-only trusted assertions for injecting in the the system trusted set.
Trusted []asserts.Assertion
) )


func init() { func init() {
Expand All @@ -258,9 +259,5 @@ func init() {
TestRootAccount = acct TestRootAccount = acct
TestRootAccountKey = accKey TestRootAccountKey = accKey
TestStoreAccountKey = storeAccKey TestStoreAccountKey = storeAccKey
} Trusted = []asserts.Assertion{TestRootAccount, TestRootAccountKey}

// Inject includes the test trusted assertions in the system trusted set.
func Inject() {
sysdb.InjectTrusted([]asserts.Assertion{TestRootAccount, TestRootAccountKey})
} }
2 changes: 1 addition & 1 deletion boot/kernel_os_test.go
View file
Expand Up @@ -152,7 +152,7 @@ func (s *kernelOSSuite) TestSetNextBootOnClassic(c *C) {
defer restore() defer restore()


// Create a fake OS snap that we try to update // Create a fake OS snap that we try to update
snapInfo := snaptest.MockSnap(c, "name: os\ntype: os", &snap.SideInfo{Revision: snap.R(42)}) snapInfo := snaptest.MockSnap(c, "name: os\ntype: os", "SNAP", &snap.SideInfo{Revision: snap.R(42)})
err := boot.SetNextBoot(snapInfo) err := boot.SetNextBoot(snapInfo)
c.Assert(err, IsNil) c.Assert(err, IsNil)


Expand Down
14 changes: 8 additions & 6 deletions cmd/snap-exec/main_test.go
View file
Expand Up @@ -73,6 +73,8 @@ hooks:
configure: configure:
`) `)


var mockContents = ""

var binaryTemplate = `#!/bin/sh var binaryTemplate = `#!/bin/sh
echo "$(basename $0)" >> %[1]q echo "$(basename $0)" >> %[1]q
for arg in "$@"; do for arg in "$@"; do
Expand Down Expand Up @@ -128,7 +130,7 @@ func (s *snapExecSuite) TestFindCommandNoCommand(c *C) {


func (s *snapExecSuite) TestSnapExecAppIntegration(c *C) { func (s *snapExecSuite) TestSnapExecAppIntegration(c *C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"), Revision: snap.R("42"),
}) })


Expand All @@ -152,7 +154,7 @@ func (s *snapExecSuite) TestSnapExecAppIntegration(c *C) {


func (s *snapExecSuite) TestSnapExecHookIntegration(c *C) { func (s *snapExecSuite) TestSnapExecHookIntegration(c *C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
snaptest.MockSnap(c, string(mockHookYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(mockHookYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"), Revision: snap.R("42"),
}) })


Expand All @@ -173,7 +175,7 @@ func (s *snapExecSuite) TestSnapExecHookIntegration(c *C) {


func (s *snapExecSuite) TestSnapExecHookMissingHookIntegration(c *C) { func (s *snapExecSuite) TestSnapExecHookMissingHookIntegration(c *C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
snaptest.MockSnap(c, string(mockHookYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(mockHookYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"), Revision: snap.R("42"),
}) })


Expand Down Expand Up @@ -210,7 +212,7 @@ func (s *snapExecSuite) TestSnapExecAppRealIntegration(c *C) {
os.Setenv("SNAP_REVISION", "42") os.Setenv("SNAP_REVISION", "42")
defer os.Unsetenv("SNAP_REVISION") defer os.Unsetenv("SNAP_REVISION")


snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"), Revision: snap.R("42"),
}) })


Expand Down Expand Up @@ -251,7 +253,7 @@ func (s *snapExecSuite) TestSnapExecHookRealIntegration(c *C) {


canaryFile := filepath.Join(c.MkDir(), "canary.txt") canaryFile := filepath.Join(c.MkDir(), "canary.txt")


testSnap := snaptest.MockSnap(c, string(mockHookYaml), &snap.SideInfo{ testSnap := snaptest.MockSnap(c, string(mockHookYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"), Revision: snap.R("42"),
}) })
hookPath := filepath.Join("meta", "hooks", "configure") hookPath := filepath.Join("meta", "hooks", "configure")
Expand Down Expand Up @@ -286,7 +288,7 @@ func actuallyExec(argv0 string, argv []string, env []string) error {


func (s *snapExecSuite) TestSnapExecShellIntegration(c *C) { func (s *snapExecSuite) TestSnapExecShellIntegration(c *C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"), Revision: snap.R("42"),
}) })


Expand Down
23 changes: 12 additions & 11 deletions cmd/snap/cmd_run_test.go
View file
Expand Up @@ -42,6 +42,7 @@ apps:
hooks: hooks:
configure: configure:
`) `)
var mockContents = "SNAP"


func (s *SnapSuite) TestInvalidParameters(c *check.C) { func (s *SnapSuite) TestInvalidParameters(c *check.C) {
invalidParameters := []string{"run", "--hook=configure", "--command=command-name", "snap-name"} invalidParameters := []string{"run", "--hook=configure", "--command=command-name", "snap-name"}
Expand All @@ -66,7 +67,7 @@ func (s *SnapSuite) TestSnapRunAppIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


si := snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ si := snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("x2"), Revision: snap.R("x2"),
}) })
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current")) err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
Expand Down Expand Up @@ -102,7 +103,7 @@ func (s *SnapSuite) TestSnapRunAppWithCommandIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


si := snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ si := snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current")) err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
Expand Down Expand Up @@ -154,7 +155,7 @@ func (s *SnapSuite) TestSnapRunHookIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


si := snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ si := snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current")) err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
Expand Down Expand Up @@ -189,7 +190,7 @@ func (s *SnapSuite) TestSnapRunHookUnsetRevisionIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


si := snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ si := snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current")) err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
Expand Down Expand Up @@ -225,10 +226,10 @@ func (s *SnapSuite) TestSnapRunHookSpecificRevisionIntegration(c *check.C) {
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


// Create both revisions 41 and 42 // Create both revisions 41 and 42
snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(41), Revision: snap.R(41),
}) })
snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })


Expand Down Expand Up @@ -262,7 +263,7 @@ func (s *SnapSuite) TestSnapRunHookMissingRevisionIntegration(c *check.C) {
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


// Only create revision 42 // Only create revision 42
si := snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ si := snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current")) err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
Expand Down Expand Up @@ -292,7 +293,7 @@ func (s *SnapSuite) TestSnapRunHookMissingHookIntegration(c *check.C) {
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


// Only create revision 42 // Only create revision 42
si := snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ si := snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current")) err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
Expand Down Expand Up @@ -331,7 +332,7 @@ func (s *SnapSuite) TestSnapRunSaneEnvironmentHandling(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


si := snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{ si := snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current")) err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
Expand All @@ -350,11 +351,11 @@ func (s *SnapSuite) TestSnapRunSaneEnvironmentHandling(c *check.C) {
os.Setenv("SNAP_ARCH", "PDP-7") os.Setenv("SNAP_ARCH", "PDP-7")
defer os.Unsetenv("SNAP_NAME") defer os.Unsetenv("SNAP_NAME")
defer os.Unsetenv("SNAP_ARCH") defer os.Unsetenv("SNAP_ARCH")
// but unreleated stuff is ok // but unrelated stuff is ok
os.Setenv("SNAP_THE_WORLD", "YES") os.Setenv("SNAP_THE_WORLD", "YES")
defer os.Unsetenv("SNAP_THE_WORLD") defer os.Unsetenv("SNAP_THE_WORLD")


// and ensure those SNAP_ vars get overriden // and ensure those SNAP_ vars get overridden
rest, err := snaprun.Parser().ParseArgs([]string{"run", "snapname.app", "--arg1", "arg2"}) rest, err := snaprun.Parser().ParseArgs([]string{"run", "snapname.app", "--arg1", "arg2"})
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(rest, check.DeepEquals, []string{"snapname.app", "--arg1", "arg2"}) c.Assert(rest, check.DeepEquals, []string{"snapname.app", "--arg1", "arg2"})
Expand Down
7 changes: 4 additions & 3 deletions cmd/snap/cmd_set_test.go
View file
Expand Up @@ -36,6 +36,7 @@ version: 1.0
hooks: hooks:
configure: configure:
`) `)
var validApplyContents = ""


func (s *SnapSuite) TestInvalidSetParameters(c *check.C) { func (s *SnapSuite) TestInvalidSetParameters(c *check.C) {
invalidParameters := []string{"set", "snap-name", "key", "value"} invalidParameters := []string{"set", "snap-name", "key", "value"}
Expand All @@ -48,7 +49,7 @@ func (s *SnapSuite) TestSnapSetIntegrationString(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


snaptest.MockSnap(c, string(validApplyYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(validApplyYaml), string(validApplyContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })


Expand All @@ -65,7 +66,7 @@ func (s *SnapSuite) TestSnapSetIntegrationNumber(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


snaptest.MockSnap(c, string(validApplyYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(validApplyYaml), string(validApplyContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })


Expand All @@ -82,7 +83,7 @@ func (s *SnapSuite) TestSnapSetIntegrationJson(c *check.C) {
dirs.SetRootDir(c.MkDir()) dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }() defer func() { dirs.SetRootDir("/") }()


snaptest.MockSnap(c, string(validApplyYaml), &snap.SideInfo{ snaptest.MockSnap(c, string(validApplyYaml), string(validApplyContents), &snap.SideInfo{
Revision: snap.R(42), Revision: snap.R(42),
}) })


Expand Down
2 changes: 1 addition & 1 deletion daemon/api_mock_test.go
View file
Expand Up @@ -33,7 +33,7 @@ func (s *apiSuite) mockSnap(c *C, yamlText string) *snap.Info {
panic("call s.daemon(c) in your test first") panic("call s.daemon(c) in your test first")
} }


snapInfo := snaptest.MockSnap(c, yamlText, &snap.SideInfo{Revision: snap.R(1)}) snapInfo := snaptest.MockSnap(c, yamlText, "", &snap.SideInfo{Revision: snap.R(1)})
snap.AddImplicitSlots(snapInfo) snap.AddImplicitSlots(snapInfo)


st := s.d.overlord.State() st := s.d.overlord.State()
Expand Down
6 changes: 4 additions & 2 deletions daemon/api_test.go
View file
Expand Up @@ -212,9 +212,10 @@ func (s *apiBaseSuite) mkInstalledInState(c *check.C, daemon *Daemon, name, deve
name: %s name: %s
version: %s version: %s
%s`, name, version, extraYaml) %s`, name, version, extraYaml)
contents := ""


// Mock the snap on disk // Mock the snap on disk
snapInfo := snaptest.MockSnap(c, yamlText, sideInfo) snapInfo := snaptest.MockSnap(c, yamlText, contents, sideInfo)


c.Assert(os.MkdirAll(snapInfo.DataDir(), 0755), check.IsNil) c.Assert(os.MkdirAll(snapInfo.DataDir(), 0755), check.IsNil)
metadir := filepath.Join(snapInfo.MountDir(), "meta") metadir := filepath.Join(snapInfo.MountDir(), "meta")
Expand Down Expand Up @@ -245,7 +246,8 @@ version: 1
type: gadget type: gadget
gadget: {store: {id: %q}} gadget: {store: {id: %q}}
`, store) `, store)
snaptest.MockSnap(c, yamlText, &snap.SideInfo{Revision: snap.R(1)}) contents := ""
snaptest.MockSnap(c, yamlText, contents, &snap.SideInfo{Revision: snap.R(1)})
c.Assert(os.Symlink("1", filepath.Join(dirs.SnapMountDir, "test", "current")), check.IsNil) c.Assert(os.Symlink("1", filepath.Join(dirs.SnapMountDir, "test", "current")), check.IsNil)
} }


Expand Down
20 changes: 10 additions & 10 deletions debian/changelog
View file
Expand Up @@ -192,7 +192,7 @@ snapd (2.17) xenial; urgency=medium
declarations (#2027) declarations (#2027)
- store: apply deltas if explicitly enabled (#2031) - store: apply deltas if explicitly enabled (#2031)
- tests: fix create-key/snap-sign test isolation (#2032) - tests: fix create-key/snap-sign test isolation (#2032)
- snap/implicit: don't restrict the camera iface to clasic (#2025) - snap/implicit: don't restrict the camera iface to classic (#2025)
- client, cmd: change buy command to match UX document (#2011) - client, cmd: change buy command to match UX document (#2011)
- coreconfig: nuke it. Also, ignore po/snappy.pot. (#2030) - coreconfig: nuke it. Also, ignore po/snappy.pot. (#2030)
- store: download deltas if explicitly enabled (#2017) - store: download deltas if explicitly enabled (#2017)
Expand Down Expand Up @@ -310,7 +310,7 @@ snapd (2.15.2ubuntu1) xenial; urgency=medium
(cherry pick PR: #1926) (cherry pick PR: #1926)
- interfaces: allow xdg-open in unity7, unity7 cleanups - interfaces: allow xdg-open in unity7, unity7 cleanups
(cherry pick PR: #1946) (cherry pick PR: #1946)
- tests: ensure http{,s}_proxy is defined inside the fake-store - tests: ensure http{,s}_proxy is defined inside the fake-store
(cherry pick PR: #1949) (cherry pick PR: #1949)


-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 21 Sep 2016 17:21:12 +0200 -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 21 Sep 2016 17:21:12 +0200
Expand Down Expand Up @@ -579,7 +579,7 @@ snapd (2.13) xenial; urgency=medium
- overlord/snapstate: check changes to SnapState for conflicts also. - overlord/snapstate: check changes to SnapState for conflicts also.
- docs/interfaces: change snappy command to snap - docs/interfaces: change snappy command to snap
- tests: test `snap run --hook` using in-tree snap-exec. - tests: test `snap run --hook` using in-tree snap-exec.
- partition: ensure that snap_{kernel,core} is not overriden with an - partition: ensure that snap_{kernel,core} is not overridden with an
empty value empty value
- asserts,overlord/assertstate: introduce an assertstate task - asserts,overlord/assertstate: introduce an assertstate task
handler to fetch snap assertions handler to fetch snap assertions
Expand Down Expand Up @@ -1139,7 +1139,7 @@ snapd (2.0.4) xenial; urgency=medium
- debian/tests: add reboot capability to autopkgtest and execute - debian/tests: add reboot capability to autopkgtest and execute
snapPersistsSuite snapPersistsSuite
- daemon,snappy,progress: drop license agreement broken logic - daemon,snappy,progress: drop license agreement broken logic
- daemon,client,cmd/snap: nice access denied message - daemon,client,cmd/snap: nice access denied message
(LP: #1574829) (LP: #1574829)
- daemon: add user parameter to all commands - daemon: add user parameter to all commands
- snap, store: rework purchase methods into decorators - snap, store: rework purchase methods into decorators
Expand Down Expand Up @@ -1373,7 +1373,7 @@ snapd (1.9.3) xenial; urgency=medium
- daemon: auto install ubuntu-core if missing - daemon: auto install ubuntu-core if missing
- oauth,store: remove OAuth authentication logic - oauth,store: remove OAuth authentication logic
- overlord/ifacestate: simplify some tests with implicit manager - overlord/ifacestate: simplify some tests with implicit manager
initalization initialization
- store, snappy: move away from hitting details directly - store, snappy: move away from hitting details directly
- overlord/ifacestate: reload connections when restarting the - overlord/ifacestate: reload connections when restarting the
manager manager
Expand Down Expand Up @@ -1531,7 +1531,7 @@ ubuntu-snappy (1.7.3+20160303ubuntu1) xenial; urgency=medium
- snappy,daemon,snap/lightweight,cmd/snappy,docs/rest.md: expose - snappy,daemon,snap/lightweight,cmd/snappy,docs/rest.md: expose
explicit channel selection to rest api explicit channel selection to rest api
- interfaces,daemon: rename package holding built-in interfaces - interfaces,daemon: rename package holding built-in interfaces
- integration-tests: add the first classic dimention tests - integration-tests: add the first classic dimension tests
- client,deaemon,docs: rename skills to interfaces on the wire - client,deaemon,docs: rename skills to interfaces on the wire
- asserts: add identity assertion type - asserts: add identity assertion type
- integration-tests: add the no_proxy env var - integration-tests: add the no_proxy env var
Expand Down Expand Up @@ -1683,11 +1683,11 @@ ubuntu-snappy (1.7.2+20160204ubuntu1) xenial; urgency=medium
- snappy: move SnapFile.Install() into Overlord.Install() - snappy: move SnapFile.Install() into Overlord.Install()
- integration-tests: re-enable some failover tests - integration-tests: re-enable some failover tests
- client: remove snaps - client: remove snaps
- asserts: uniform searching accross trusted (account keys) and main - asserts: uniform searching across trusted (account keys) and main
backstore backstore
- asserts: introduce Decoder to parse streams of assertions and - asserts: introduce Decoder to parse streams of assertions and
Encoder to build them Encoder to build them
- client: filter snaps with a seach query - client: filter snaps with a search query
- client: pass query as well as path in client internals - client: pass query as well as path in client internals
- skills: provide different security snippets for skill and slot - skills: provide different security snippets for skill and slot
side side
Expand Down Expand Up @@ -1832,7 +1832,7 @@ ubuntu-snappy (1.2-0ubuntu1) wily; urgency=medium
- Consider the root directory when installing and removing policies - Consider the root directory when installing and removing policies
- In the uboot TestHandleAssetsNoHardwareYaml, patch the cache dir - In the uboot TestHandleAssetsNoHardwareYaml, patch the cache dir
before creating the partition type before creating the partition type
- In the PartitionTestSuite, remove the unnecesary patches for - In the PartitionTestSuite, remove the unnecessary patches for
defaultCacheDir defaultCacheDir
- Fix the help output of "snappy install -h" - Fix the help output of "snappy install -h"


Expand Down Expand Up @@ -1895,7 +1895,7 @@ ubuntu-snappy (0.1.1-0ubuntu1) vivid; urgency=low


-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 12 Feb 2015 13:51:22 +0100 -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 12 Feb 2015 13:51:22 +0100


ubuntu-snappy (0.1-0ubuntu1) vivid; urgency=medium ubuntu-snappy (0.1-0ubuntu1) vivid; urgency=medium


* Initial packaging * Initial packaging


Expand Down
4 changes: 4 additions & 0 deletions dirs/dirs.go
View file
Expand Up @@ -66,6 +66,8 @@ var (
ClassicDir string ClassicDir string


LibExecDir string LibExecDir string

XdgRuntimeDirGlob string
) )


var ( var (
Expand Down Expand Up @@ -142,4 +144,6 @@ func SetRootDir(rootdir string) {
ClassicDir = filepath.Join(rootdir, "/writable/classic") ClassicDir = filepath.Join(rootdir, "/writable/classic")


LibExecDir = filepath.Join(rootdir, "/usr/lib/snapd") LibExecDir = filepath.Join(rootdir, "/usr/lib/snapd")

XdgRuntimeDirGlob = filepath.Join(rootdir, "/run/user/*/")
} }
2 changes: 1 addition & 1 deletion etc/X11/Xsession.d/65snappy
View file
@@ -1,5 +1,5 @@
# This file is sourced by Xsession(5), not executed. # This file is sourced by Xsession(5), not executed.
# Add additionnal the additonal snappy desktop path # Add the additional snappy desktop path


if [ -z "$XDG_DATA_DIRS" ]; then if [ -z "$XDG_DATA_DIRS" ]; then
# 60x11-common_xdg_path does not always set XDG_DATA_DIRS # 60x11-common_xdg_path does not always set XDG_DATA_DIRS
Expand Down

0 comments on commit e4fbc27

Please sign in to comment.