Last commit made on 2020-09-07
Get this branch:
git clone -b release/2.46

Branch merges

Branch information


Recent commits

a9b0c73... by Michael Vogt on 2020-09-07

Merge pull request #9279 from mvo5/release-branches-run-tests-on-push

github: run tests also on push to release branches

83bbf73... by Michael Vogt on 2020-09-04

releasing package snapd version 2.46.1

c8db35f... by Michael Vogt on 2020-09-04

interfaces: allow snap-update-ns to read /proc/cmdline

Recently we saw failures in
`google:ubuntu-16.04-64:tests/regression/lp-1813963` with:

2020-09-04T08:28:55.9397496Z [ 1190.482027] audit: type=1400 audit(1599208134.910:365): apparmor="DENIED" operation="open" profile="snap-update-ns.test-snapd-simple-service" name="/proc/cmdline" pid=22275 comm="5" requested_mask="r" denied_mask="r" fsuid=0 ouid=0

The logger.go code now looks at /proc/cmdline with the merge of
PR#9158 but the profile of snap-update-ns was not updated.

a1f3fc6... by Michael Vogt on 2020-09-04

github: run tests also on push to release branches

Fixes for release branches are often cherry-picked and then
directly pushed. This commit ensures that this results in a
full test run too. Right now we are flying a bit blind and
may miss that fixes like PR#9242 also need to go to the
release branches.

66463c6... by Maciej Borzecki on 2020-08-31

github: run macOS job with Go 1.14

The github job on macOS is using Go 1.10 and fails when pulling dependencies
like so:

  Installing govendor
  Obtaining dependencies
  ##[error]../../../ undefined: fcntl
  ##[error]../../../ undefined: fcntl
  ##[error]../../../ undefined: ioctl
  ##[error]../../../ undefined: ioctl
  ##[error]../../../ undefined: ioctl
  ##[error]../../../ undefined: ioctl
  ##[error]../../../ undefined: ioctl
  ##[error]../../../ undefined: ioctl
  ##[error]../../../ undefined: mmap
  ##[error]../../../ undefined: munmap
  ##[error]../../../ too many errors
  ##[error]Process completed with exit code 2.

Signed-off-by: Maciej Borzecki <email address hidden>

7e93d4d... by Michael Vogt on 2020-09-02

Merge pull request #9255 from stolowski/disk-space-awareness/feature-flag-remove-246

o/snapstate, features: add feature flag for disk space check on remove (2.46)

3f26df3... by Paweł Stołowski on 2020-09-01

Add feature flag for disk space check on remove.

8d48058... by Zygmunt Krynicki on 2020-08-27

tests: account for apt-get on core18

For unknown reasons core18 now contains the fake apt-get script, while
core20 does not. Adjust the test to match reality.

Signed-off-by: Zygmunt Krynicki <email address hidden>

de4b115... by Ian Johnson on 2020-08-26 simple hack to include dirty in version if the tree is dirty

We want dirty to show up in the version number if the tree is in fact dirty when
we build. Currently, if the version is dirty on a tag, we would get something
like 2.46-dirty as version_from_git, which will not be the same as 2.46 from the
changelog, and then we produce a silly version number like:


but with this we now produce:


And for commits that are not directly on a tag, and are dirty, we get


which also produces the desired effect of including dirty in the version.

Signed-off-by: Ian Johnson <email address hidden>

1d32345... by Zygmunt Krynicki on 2020-08-26

interfaces/systemd: compare dereferenced Service

The systemd backend is relatively unique, as it is only used by one
interface. The GPIO interface uses it to create systemd units which
export GPIOs from kernel / firmware to userspace and back.

The specification system for the systemd backend is comprised of named
services. The code allows for repeated generation of identical services,
sharing the same name, that are coalesced as long as their definitions
are identical.

Based on a customer report, we found a mistake in how this coalescing
was performed. The code performed pointer comparison, not object
equality comparison. This patch fixes this issue, adds unit tests
checking that case and improves the diagnostic error message to simplify
debugging in the future.

Signed-off-by: Zygmunt Krynicki <email address hidden>