Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into tests/upgrade-os-…

…no-gc
  • Loading branch information...
2 parents 304524d + d54f41a commit e4fbc27fa09db70d3752b16ac4b53ae80d688628 @mvo5 mvo5 committed Nov 18, 2016
Showing with 2,693 additions and 625 deletions.
  1. +2 −2 {overlord/assertstate → asserts/sysdb}/testkeys.go
  2. +3 −6 asserts/systestkeys/trusted.go
  3. +1 −1 boot/kernel_os_test.go
  4. +8 −6 cmd/snap-exec/main_test.go
  5. +12 −11 cmd/snap/cmd_run_test.go
  6. +4 −3 cmd/snap/cmd_set_test.go
  7. +1 −1 daemon/api_mock_test.go
  8. +4 −2 daemon/api_test.go
  9. +10 −10 debian/changelog
  10. +4 −0 dirs/dirs.go
  11. +1 −1 etc/X11/Xsession.d/65snappy
  12. +1 −3 image/image.go
  13. +5 −0 interfaces/apparmor/template.go
  14. +20 −15 interfaces/builtin/all.go
  15. +18 −12 interfaces/builtin/all_test.go
  16. +39 −0 interfaces/builtin/alsa.go
  17. +88 −0 interfaces/builtin/alsa_test.go
  18. +129 −0 interfaces/builtin/avahi_observe.go
  19. +93 −0 interfaces/builtin/avahi_observe_test.go
  20. +29 −0 interfaces/builtin/basedeclaration.go
  21. +2 −3 interfaces/builtin/basedeclaration_test.go
  22. +0 −4 interfaces/builtin/bluetooth_control_test.go
  23. +0 −4 interfaces/builtin/bluez.go
  24. +0 −4 interfaces/builtin/bool_file.go
  25. +0 −4 interfaces/builtin/bool_file_test.go
  26. +1 −4 interfaces/builtin/browser_support.go
  27. +0 −4 interfaces/builtin/browser_support_test.go
  28. +0 −5 interfaces/builtin/common.go
  29. +0 −4 interfaces/builtin/content.go
  30. +0 −36 interfaces/builtin/content_test.go
  31. +2 −1 interfaces/builtin/cups_control.go
  32. +0 −4 interfaces/builtin/dcdbas_control_test.go
  33. +0 −4 interfaces/builtin/docker.go
  34. +1 −4 interfaces/builtin/docker_support.go
  35. +0 −4 interfaces/builtin/docker_support_test.go
  36. +0 −4 interfaces/builtin/docker_test.go
  37. +0 −4 interfaces/builtin/firewall_control_test.go
  38. +0 −1 interfaces/builtin/fuse_support.go
  39. +0 −4 interfaces/builtin/fuse_support_test.go
  40. +0 −4 interfaces/builtin/fwupd.go
  41. +0 −4 interfaces/builtin/gpio.go
  42. +0 −1 interfaces/builtin/gsettings.go
  43. +0 −4 interfaces/builtin/gsettings_test.go
  44. +8 −0 interfaces/builtin/hardware_observe.go
  45. +0 −4 interfaces/builtin/hardware_observe_test.go
  46. +1 −5 interfaces/builtin/hidraw.go
  47. +0 −2 interfaces/builtin/home.go
  48. +0 −6 interfaces/builtin/home_test.go
  49. +132 −0 interfaces/builtin/i2c.go
  50. +201 −0 interfaces/builtin/i2c_test.go
  51. +0 −1 interfaces/builtin/kernel_module_control.go
  52. +0 −2 interfaces/builtin/libvirt.go
  53. +0 −4 interfaces/builtin/libvirt_test.go
  54. +0 −4 interfaces/builtin/locale_control_test.go
  55. +0 −4 interfaces/builtin/location_control.go
  56. +0 −4 interfaces/builtin/location_observe.go
  57. +0 −4 interfaces/builtin/log_observe_test.go
  58. +0 −4 interfaces/builtin/lxd.go
  59. +0 −5 interfaces/builtin/lxd_support.go
  60. +0 −4 interfaces/builtin/lxd_support_test.go
  61. +0 −4 interfaces/builtin/lxd_test.go
  62. +0 −4 interfaces/builtin/mir.go
  63. +0 −4 interfaces/builtin/mir_test.go
  64. +0 −4 interfaces/builtin/modem_manager.go
  65. +3 −0 interfaces/builtin/mount_observe.go
  66. +0 −4 interfaces/builtin/mount_observe_test.go
  67. +0 −4 interfaces/builtin/mpris.go
  68. +0 −5 interfaces/builtin/mpris_test.go
  69. +0 −1 interfaces/builtin/network.go
  70. +0 −1 interfaces/builtin/network_bind.go
  71. +0 −4 interfaces/builtin/network_bind_test.go
  72. +0 −4 interfaces/builtin/network_manager.go
  73. +0 −4 interfaces/builtin/network_observe_test.go
  74. +0 −4 interfaces/builtin/network_setup_observe_test.go
  75. +0 −4 interfaces/builtin/network_test.go
  76. +324 −0 interfaces/builtin/ofono.go
  77. +173 −0 interfaces/builtin/ofono_test.go
  78. +0 −1 interfaces/builtin/opengl.go
  79. +0 −1 interfaces/builtin/optical_drive.go
  80. +0 −4 interfaces/builtin/ppp.go
  81. +0 −4 interfaces/builtin/process_control_test.go
  82. +3 −4 interfaces/builtin/pulseaudio.go
  83. +0 −4 interfaces/builtin/removable_media_test.go
  84. +0 −1 interfaces/builtin/screen_inhibit_control.go
  85. +0 −4 interfaces/builtin/screen_inhibit_control_test.go
  86. +1 −5 interfaces/builtin/serial_port.go
  87. +0 −1 interfaces/builtin/shutdown.go
  88. +0 −4 interfaces/builtin/shutdown_test.go
  89. +0 −1 interfaces/builtin/snapd_control.go
  90. +0 −4 interfaces/builtin/snapd_control_test.go
  91. +17 −0 interfaces/builtin/system_observe.go
  92. +0 −4 interfaces/builtin/system_observe_test.go
  93. +0 −4 interfaces/builtin/system_trace_test.go
  94. +0 −1 interfaces/builtin/time_control.go
  95. +0 −4 interfaces/builtin/time_control_test.go
  96. +0 −4 interfaces/builtin/timeserver_control_test.go
  97. +0 −4 interfaces/builtin/timezone_control_test.go
  98. +0 −1 interfaces/builtin/tpm.go
  99. +0 −4 interfaces/builtin/tpm_test.go
  100. +0 −4 interfaces/builtin/udisks2.go
  101. +0 −4 interfaces/builtin/udisks2_test.go
  102. +15 −9 interfaces/builtin/unity7.go
  103. +0 −4 interfaces/builtin/unity7_test.go
  104. +0 −1 interfaces/builtin/upower_observe.go
  105. +0 −4 interfaces/builtin/upower_observe_test.go
  106. +49 −0 interfaces/builtin/usb_raw.go
  107. +88 −0 interfaces/builtin/usb_raw_test.go
  108. +9 −0 interfaces/builtin/utils.go
  109. +0 −1 interfaces/builtin/x11.go
  110. +0 −4 interfaces/builtin/x11_test.go
  111. +0 −6 interfaces/core.go
  112. +1 −0 interfaces/seccomp/template.go
  113. +0 −4 interfaces/testtype.go
  114. +76 −0 osutil/chattr.go
  115. +27 −0 osutil/chattr_32.go
  116. +28 −0 osutil/chattr_64.go
  117. +7 −0 osutil/export_test.go
  118. +13 −2 osutil/user.go
  119. +34 −0 osutil/user_test.go
  120. +10 −10 overlord/devicestate/devicemgr_test.go
  121. +2 −1 overlord/hookstate/hookmgr_test.go
  122. +2 −2 overlord/ifacestate/ifacemgr_test.go
  123. +1 −1 overlord/managers_test.go
  124. +1 −1 overlord/patch/patch.go
  125. +24 −23 overlord/snapstate/backend/copydata_test.go
  126. +8 −4 overlord/snapstate/backend/link_test.go
  127. +8 −0 overlord/snapstate/backend/snapdata.go
  128. +4 −4 overlord/snapstate/booted_test.go
  129. +7 −7 overlord/snapstate/check_snap_test.go
  130. +5 −5 overlord/snapstate/snapmgr_test.go
  131. +1 −1 overlord/snapstate/snapstate.go
  132. +1 −1 overlord/state/task.go
  133. +1 −1 overlord/state/taskrunner.go
  134. +1 −1 partition/bootloader.go
  135. +2 −2 progress/progress.go
  136. +6 −1 run-checks
  137. +3 −0 snap/container.go
  138. +7 −5 snap/gadget_test.go
  139. +7 −3 snap/implicit.go
  140. +24 −0 snap/info.go
  141. +11 −0 snap/info_snap_yaml_test.go
  142. +12 −8 snap/info_test.go
  143. +11 −0 snap/snapdir/snapdir.go
  144. +1 −0 snap/snapenv/snapenv.go
  145. +2 −0 snap/snapenv/snapenv_test.go
  146. +1 −1 snap/snaptest/build.go
  147. +8 −1 snap/snaptest/snaptest.go
  148. +2 −1 snap/snaptest/snaptest_test.go
  149. +10 −0 snap/squashfs/squashfs.go
  150. +2 −1 snap/types.go
  151. +0 −12 spread.yaml
  152. +28 −5 store/logger.go
  153. +31 −0 store/logger_test.go
  154. +182 −81 store/store.go
  155. +440 −15 store/store_test.go
  156. +5 −1 store/userinfo.go
  157. +1 −1 strutil/strutil.go
  158. +2 −3 systemd/systemd.go
  159. +1 −0 systemd/systemd_test.go
  160. +1 −1 tests/lib/snaps/test-snapd-content-plug/meta/snap.yaml
  161. +1 −0 tests/lib/snaps/test-snapd-fuse-consumer/snapcraft.yaml
  162. +15 −0 tests/main/chattr/task.yaml
  163. +51 −0 tests/main/chattr/toggle.go
  164. +3 −3 tests/main/install-store-laaaarge/task.yaml
  165. +3 −3 tests/main/login/task.yaml
  166. +2 −0 tests/main/login/unsuccessful_login.exp
  167. +1 −1 tests/main/postrm-purge/task.yaml
  168. +1 −1 tests/main/security-devpts/pts.exp
  169. +1 −1 tests/main/security-devpts/task.yaml
  170. +1 −1 tests/main/security-private-tmp/task.yaml
  171. +1 −1 tests/main/security-private-tmp/tmp-create.exp
  172. +3 −3 tests/main/snap-download/task.yaml
  173. +30 −0 tests/main/snap-env/task.yaml
  174. +3 −3 testutil/checkers_test.go
  175. +6 −0 vendor/vendor.json
  176. +2 −1 wrappers/binaries_test.go
  177. +2 −1 wrappers/desktop_test.go
  178. +3 −3 wrappers/services_test.go
@@ -18,13 +18,13 @@
*
*/
-package assertstate
+package sysdb
import (
"github.com/snapcore/snapd/asserts/systestkeys"
)
// init will inject the test trusted assertions when this module build tag "withtestkeys" is defined.
func init() {
- systestkeys.Inject()
+ InjectTrusted(systestkeys.Trusted)
}
@@ -24,7 +24,6 @@ import (
"fmt"
"github.com/snapcore/snapd/asserts"
- "github.com/snapcore/snapd/asserts/sysdb"
)
const (
@@ -239,6 +238,8 @@ var (
TestRootAccountKey asserts.Assertion
// here for convenience, does not need to be in the trusted set
TestStoreAccountKey asserts.Assertion
+ // Testing-only trusted assertions for injecting in the the system trusted set.
+ Trusted []asserts.Assertion
)
func init() {
@@ -258,9 +259,5 @@ func init() {
TestRootAccount = acct
TestRootAccountKey = accKey
TestStoreAccountKey = storeAccKey
-}
-
-// Inject includes the test trusted assertions in the system trusted set.
-func Inject() {
- sysdb.InjectTrusted([]asserts.Assertion{TestRootAccount, TestRootAccountKey})
+ Trusted = []asserts.Assertion{TestRootAccount, TestRootAccountKey}
}
@@ -152,7 +152,7 @@ func (s *kernelOSSuite) TestSetNextBootOnClassic(c *C) {
defer restore()
// 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)
c.Assert(err, IsNil)
@@ -73,6 +73,8 @@ hooks:
configure:
`)
+var mockContents = ""
+
var binaryTemplate = `#!/bin/sh
echo "$(basename $0)" >> %[1]q
for arg in "$@"; do
@@ -128,7 +130,7 @@ func (s *snapExecSuite) TestFindCommandNoCommand(c *C) {
func (s *snapExecSuite) TestSnapExecAppIntegration(c *C) {
dirs.SetRootDir(c.MkDir())
- snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"),
})
@@ -152,7 +154,7 @@ func (s *snapExecSuite) TestSnapExecAppIntegration(c *C) {
func (s *snapExecSuite) TestSnapExecHookIntegration(c *C) {
dirs.SetRootDir(c.MkDir())
- snaptest.MockSnap(c, string(mockHookYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(mockHookYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"),
})
@@ -173,7 +175,7 @@ func (s *snapExecSuite) TestSnapExecHookIntegration(c *C) {
func (s *snapExecSuite) TestSnapExecHookMissingHookIntegration(c *C) {
dirs.SetRootDir(c.MkDir())
- snaptest.MockSnap(c, string(mockHookYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(mockHookYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"),
})
@@ -210,7 +212,7 @@ func (s *snapExecSuite) TestSnapExecAppRealIntegration(c *C) {
os.Setenv("SNAP_REVISION", "42")
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"),
})
@@ -251,7 +253,7 @@ func (s *snapExecSuite) TestSnapExecHookRealIntegration(c *C) {
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"),
})
hookPath := filepath.Join("meta", "hooks", "configure")
@@ -286,7 +288,7 @@ func actuallyExec(argv0 string, argv []string, env []string) error {
func (s *snapExecSuite) TestSnapExecShellIntegration(c *C) {
dirs.SetRootDir(c.MkDir())
- snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R("42"),
})
@@ -42,6 +42,7 @@ apps:
hooks:
configure:
`)
+var mockContents = "SNAP"
func (s *SnapSuite) TestInvalidParameters(c *check.C) {
invalidParameters := []string{"run", "--hook=configure", "--command=command-name", "snap-name"}
@@ -66,7 +67,7 @@ func (s *SnapSuite) TestSnapRunAppIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir())
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"),
})
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
@@ -102,7 +103,7 @@ func (s *SnapSuite) TestSnapRunAppWithCommandIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir())
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),
})
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
@@ -154,7 +155,7 @@ func (s *SnapSuite) TestSnapRunHookIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir())
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),
})
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
@@ -189,7 +190,7 @@ func (s *SnapSuite) TestSnapRunHookUnsetRevisionIntegration(c *check.C) {
dirs.SetRootDir(c.MkDir())
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),
})
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
@@ -225,10 +226,10 @@ func (s *SnapSuite) TestSnapRunHookSpecificRevisionIntegration(c *check.C) {
defer func() { dirs.SetRootDir("/") }()
// 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),
})
- snaptest.MockSnap(c, string(mockYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(mockYaml), string(mockContents), &snap.SideInfo{
Revision: snap.R(42),
})
@@ -262,7 +263,7 @@ func (s *SnapSuite) TestSnapRunHookMissingRevisionIntegration(c *check.C) {
defer func() { dirs.SetRootDir("/") }()
// 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),
})
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
@@ -292,7 +293,7 @@ func (s *SnapSuite) TestSnapRunHookMissingHookIntegration(c *check.C) {
defer func() { dirs.SetRootDir("/") }()
// 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),
})
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
@@ -331,7 +332,7 @@ func (s *SnapSuite) TestSnapRunSaneEnvironmentHandling(c *check.C) {
dirs.SetRootDir(c.MkDir())
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),
})
err := os.Symlink(si.MountDir(), filepath.Join(si.MountDir(), "../current"))
@@ -350,11 +351,11 @@ func (s *SnapSuite) TestSnapRunSaneEnvironmentHandling(c *check.C) {
os.Setenv("SNAP_ARCH", "PDP-7")
defer os.Unsetenv("SNAP_NAME")
defer os.Unsetenv("SNAP_ARCH")
- // but unreleated stuff is ok
+ // but unrelated stuff is ok
os.Setenv("SNAP_THE_WORLD", "YES")
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"})
c.Assert(err, check.IsNil)
c.Assert(rest, check.DeepEquals, []string{"snapname.app", "--arg1", "arg2"})
@@ -36,6 +36,7 @@ version: 1.0
hooks:
configure:
`)
+var validApplyContents = ""
func (s *SnapSuite) TestInvalidSetParameters(c *check.C) {
invalidParameters := []string{"set", "snap-name", "key", "value"}
@@ -48,7 +49,7 @@ func (s *SnapSuite) TestSnapSetIntegrationString(c *check.C) {
dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }()
- snaptest.MockSnap(c, string(validApplyYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(validApplyYaml), string(validApplyContents), &snap.SideInfo{
Revision: snap.R(42),
})
@@ -65,7 +66,7 @@ func (s *SnapSuite) TestSnapSetIntegrationNumber(c *check.C) {
dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }()
- snaptest.MockSnap(c, string(validApplyYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(validApplyYaml), string(validApplyContents), &snap.SideInfo{
Revision: snap.R(42),
})
@@ -82,7 +83,7 @@ func (s *SnapSuite) TestSnapSetIntegrationJson(c *check.C) {
dirs.SetRootDir(c.MkDir())
defer func() { dirs.SetRootDir("/") }()
- snaptest.MockSnap(c, string(validApplyYaml), &snap.SideInfo{
+ snaptest.MockSnap(c, string(validApplyYaml), string(validApplyContents), &snap.SideInfo{
Revision: snap.R(42),
})
@@ -33,7 +33,7 @@ func (s *apiSuite) mockSnap(c *C, yamlText string) *snap.Info {
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)
st := s.d.overlord.State()
View
@@ -212,9 +212,10 @@ func (s *apiBaseSuite) mkInstalledInState(c *check.C, daemon *Daemon, name, deve
name: %s
version: %s
%s`, name, version, extraYaml)
+ contents := ""
// 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)
metadir := filepath.Join(snapInfo.MountDir(), "meta")
@@ -245,7 +246,8 @@ version: 1
type: gadget
gadget: {store: {id: %q}}
`, 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)
}
View
@@ -192,7 +192,7 @@ snapd (2.17) xenial; urgency=medium
declarations (#2027)
- store: apply deltas if explicitly enabled (#2031)
- 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)
- coreconfig: nuke it. Also, ignore po/snappy.pot. (#2030)
- store: download deltas if explicitly enabled (#2017)
@@ -310,7 +310,7 @@ snapd (2.15.2ubuntu1) xenial; urgency=medium
(cherry pick PR: #1926)
- interfaces: allow xdg-open in unity7, unity7 cleanups
(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)
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 21 Sep 2016 17:21:12 +0200
@@ -579,7 +579,7 @@ snapd (2.13) xenial; urgency=medium
- overlord/snapstate: check changes to SnapState for conflicts also.
- docs/interfaces: change snappy command to snap
- 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
- asserts,overlord/assertstate: introduce an assertstate task
handler to fetch snap assertions
@@ -1139,7 +1139,7 @@ snapd (2.0.4) xenial; urgency=medium
- debian/tests: add reboot capability to autopkgtest and execute
snapPersistsSuite
- 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)
- daemon: add user parameter to all commands
- snap, store: rework purchase methods into decorators
@@ -1373,7 +1373,7 @@ snapd (1.9.3) xenial; urgency=medium
- daemon: auto install ubuntu-core if missing
- oauth,store: remove OAuth authentication logic
- overlord/ifacestate: simplify some tests with implicit manager
- initalization
+ initialization
- store, snappy: move away from hitting details directly
- overlord/ifacestate: reload connections when restarting the
manager
@@ -1531,7 +1531,7 @@ ubuntu-snappy (1.7.3+20160303ubuntu1) xenial; urgency=medium
- snappy,daemon,snap/lightweight,cmd/snappy,docs/rest.md: expose
explicit channel selection to rest api
- 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
- asserts: add identity assertion type
- integration-tests: add the no_proxy env var
@@ -1683,11 +1683,11 @@ ubuntu-snappy (1.7.2+20160204ubuntu1) xenial; urgency=medium
- snappy: move SnapFile.Install() into Overlord.Install()
- integration-tests: re-enable some failover tests
- client: remove snaps
- - asserts: uniform searching accross trusted (account keys) and main
+ - asserts: uniform searching across trusted (account keys) and main
backstore
- asserts: introduce Decoder to parse streams of assertions and
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
- skills: provide different security snippets for skill and slot
side
@@ -1832,7 +1832,7 @@ ubuntu-snappy (1.2-0ubuntu1) wily; urgency=medium
- Consider the root directory when installing and removing policies
- In the uboot TestHandleAssetsNoHardwareYaml, patch the cache dir
before creating the partition type
- - In the PartitionTestSuite, remove the unnecesary patches for
+ - In the PartitionTestSuite, remove the unnecessary patches for
defaultCacheDir
- Fix the help output of "snappy install -h"
@@ -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
-ubuntu-snappy (0.1-0ubuntu1) vivid; urgency=medium
+ubuntu-snappy (0.1-0ubuntu1) vivid; urgency=medium
* Initial packaging
View
@@ -66,6 +66,8 @@ var (
ClassicDir string
LibExecDir string
+
+ XdgRuntimeDirGlob string
)
var (
@@ -142,4 +144,6 @@ func SetRootDir(rootdir string) {
ClassicDir = filepath.Join(rootdir, "/writable/classic")
LibExecDir = filepath.Join(rootdir, "/usr/lib/snapd")
+
+ XdgRuntimeDirGlob = filepath.Join(rootdir, "/run/user/*/")
}
@@ -1,5 +1,5 @@
# 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
# 60x11-common_xdg_path does not always set XDG_DATA_DIRS
Oops, something went wrong.

0 comments on commit e4fbc27

Please sign in to comment.