Merge ~jhodapp/snappy-hwe-snaps/+git/alsa-utils:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/alsa-utils:master

Proposed by Jim Hodapp
Status: Merged
Approved by: Simon Fels
Approved revision: be5d971a16a6d39205554b42cf58b1ab84f7c791
Merged at revision: 2f58a78b5bc8b02054bf6ff8b8a0584e624f243d
Proposed branch: ~jhodapp/snappy-hwe-snaps/+git/alsa-utils:master
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/alsa-utils:master
Diff against target: 129 lines (+23/-35)
2 files modified
snapcraft.yaml (+17/-34)
tests/integration/lib/utilities.sh (+6/-1)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+323937@code.launchpad.net

Description of the change

Adopt for new aliases coming with snapd v2.25

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 e798d0c..ce7a5e8 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -17,88 +17,71 @@ apps:
6 speaker-test:
7 command: usr/bin/speaker-test
8 plugs: [ alsa, home ]
9- aliases:
10- - speaker-test
11+ aliases: [speaker-test]
12 alsactl:
13 command: usr/sbin/alsactl
14 plugs: [ alsa, home ]
15- aliases:
16- - alsactl
17+ aliases: [alsactl]
18 amixer:
19 command: usr/bin/amixer
20 plugs: [ alsa, home ]
21- aliases:
22- - amixer
23+ aliases: [amixer]
24 aplay:
25 command: usr/bin/aplay
26 plugs: [ alsa, home ]
27- aliases:
28- - aplay
29+ aliases: [aplay]
30 aseqnet:
31 command: usr/bin/aseqnet
32 plugs: [ alsa, home ]
33- aliases:
34- - aseqnet
35+ aliases: [aseqnet]
36 alsatplg:
37 command: usr/bin/alsatplg
38 plugs: [ alsa, home ]
39- aliases:
40- - alsatplg
41+ aliases: [alsatplg]
42 arecordmidi:
43 command: usr/bin/arecordmidi
44 plugs: [ alsa, home ]
45- aliases:
46- - arecordmidi
47+ aliases: [arecordmidi]
48 amidi:
49 command: usr/bin/amidi
50 plugs: [ alsa, home ]
51- aliases:
52- - amidi
53+ aliases: [amidi]
54 alsaloop:
55 command: usr/bin/alsaloop
56 plugs: [ alsa, home ]
57- aliases:
58- - alsaloop
59+ aliases: [alsaloop]
60 alsaucm:
61 command: usr/bin/alsaucm
62 plugs: [ alsa, home ]
63- aliases:
64- - alsaucm
65+ aliases: [alsaucm]
66 aconnect:
67 command: usr/bin/aconnect
68 plugs: [ alsa, home ]
69- aliases:
70- - aconnect
71+ aliases: [aconnect]
72 iecset:
73 command: usr/bin/iecset
74 plugs: [ alsa, home ]
75- aliases:
76- - iecset
77+ aliases: [iecset]
78 alsabat:
79 command: usr/bin/alsabat
80 plugs: [ alsa, home ]
81- aliases:
82- - alsabat
83+ aliases: [alsabat]
84 aseqdump:
85 command: usr/bin/aseqdump
86 plugs: [ alsa, home ]
87- aliases:
88- - aseqdump
89+ aliases: [aseqdump]
90 aplaymidi:
91 command: usr/bin/aplaymidi
92 plugs: [ alsa, home ]
93- aliases:
94- - aplaymidi
95+ aliases: [aplaymidi]
96 alsamixer:
97 command: usr/bin/alsamixer
98 plugs: [ alsa, home ]
99- aliases:
100- - alsamixer
101+ aliases: [alsamixer]
102 arecord:
103 command: usr/bin/arecord
104 plugs: [ alsa, home ]
105- aliases:
106- - arecord
107+ aliases: [arecord]
108
109 plugs:
110 device-conf:
111diff --git a/tests/integration/lib/utilities.sh b/tests/integration/lib/utilities.sh
112index 1c89ef4..fc28747 100644
113--- a/tests/integration/lib/utilities.sh
114+++ b/tests/integration/lib/utilities.sh
115@@ -32,8 +32,13 @@ install_snap_under_test() {
116 snap connect alsa-utils:$plug core
117 done
118 # Setup all necessary aliases
119+ snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
120 for alias in $SNAP_AUTO_ALIASES ; do
121- snap alias $SNAP_NAME $alias
122+ target=$SNAP_NAME.$alias
123+ if dpkg --compare-versions $snapd_version lt 2.25 ; then
124+ target=$SNAP_NAME
125+ fi
126+ snap alias $target $alias
127 done
128 fi
129 }

Subscribers

People subscribed via source and target branches

to all changes: