snappy-hwe-snaps

Merge ~jhodapp/snappy-hwe-snaps/+git/fix-pulseaudio-slots-plugs:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

  1. Git
  2. lp:~jhodapp/snappy-hwe-snaps/+git/fix-pulseaudio-slots-plugs
  3. master
  4. Merge into master
Proposed by Jim Hodapp
Status: Merged
Approved by: Simon Fels
Approved revision: 24b7f71878fb54020958fbc60b5f89913aa85d0d
Merged at revision: a27ba3eb10641fea4221f15651c7816967872cc4
Proposed branch: ~jhodapp/snappy-hwe-snaps/+git/fix-pulseaudio-slots-plugs:master
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
Diff against target: 47 lines (+13/-8)
1 file modified
snapcraft.yaml (+13/-8)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+309604@code.launchpad.net

Commit message

Fix the issue of having the same slot and plug name allowing paplay and other included to again work correctly.

Description of the change

Fix the issue of having the same slot and plug name allowing paplay and other included to again work correctly.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:24b7f71878fb54020958fbc60b5f89913aa85d0d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/230/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/132/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/230/rebuild

review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:24b7f71878fb54020958fbc60b5f89913aa85d0d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/231/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/133/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/231/rebuild

review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index 59d636f..a7dd7e5 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -8,29 +8,34 @@ description: |
6
7 Please find the source code for this snap at:
8 https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
9+grade: stable
10 confinement: strict
11
12 apps:
13 pulseaudio:
14 command: bin/pulseaudio
15 daemon: simple
16- slots:
17- - pulseaudio
18+ slots: [service]
19 pactl:
20 command: bin/pactl
21- plugs:
22- - pulseaudio
23+ plugs: [client]
24 paplay:
25 command: bin/paplay
26- plugs:
27- - pulseaudio
28+ plugs: [client,home]
29 parec:
30 command: bin/parec
31- plugs:
32- - pulseaudio
33+ plugs: [client]
34 config:
35 command: bin/config
36
37+slots:
38+ service:
39+ interface: pulseaudio
40+
41+plugs:
42+ client:
43+ interface: pulseaudio
44+
45 parts:
46 pulseaudio-common:
47 plugin: copy

Subscribers

People subscribed via source and target branches

to all changes: