Merge ~morphis/snappy-hwe-snaps/+git/pulseaudio:f/adopt-new-aliases into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

Proposed by Simon Fels on 2017-05-10
Status: Merged
Approved by: Konrad Zapałowicz on 2017-05-15
Approved revision: 6cb9950120668309eeeea1866a34cf4e6e861f99
Merged at revision: 76525c9086749ce29974453bbe74c64a1153b943
Proposed branch: ~morphis/snappy-hwe-snaps/+git/pulseaudio:f/adopt-new-aliases
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
Diff against target: 51 lines (+15/-7)
2 files modified
snapcraft.yaml (+9/-6)
tests/lib/utilities.sh (+6/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration 2017-05-10 Approve on 2017-05-11
Jim Hodapp Needs Fixing on 2017-05-10
Konrad Zapałowicz (community) code Approve on 2017-05-10
Review via email: mp+323847@code.launchpad.net

Description of the change

Adopt for new aliases coming with 2.25

To post a comment you must log in.
Konrad Zapałowicz (kzapalowicz) wrote :

lgtm

review: Approve (code)
Jim Hodapp (jhodapp) wrote :

Two minor things to fix.

review: Needs Fixing
Konrad Zapałowicz (kzapalowicz) wrote :

t-a because all of the comments have been applied already.

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 605243c..736791d 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -19,18 +19,21 @@ apps:
6 pactl:
7 command: bin/client-wrapper usr/bin/pactl
8 plugs: [client, network]
9- aliases:
10- - pactl
11+ # NOTE: This is deprecated with snapd 2.25 but needs to stay to
12+ # guarantee all clients are updated correctly.
13+ aliases: [pactl]
14 paplay:
15 command: bin/client-wrapper usr/bin/paplay
16 plugs: [client, home, network]
17- aliases:
18- - paplay
19+ # NOTE: This is deprecated with snapd 2.25 but needs to stay to
20+ # guarantee all clients are updated correctly.
21+ aliases: [paplay]
22 parec:
23 command: bin/client-wrapper usr/bin/parec
24 plugs: [client, home, network]
25- aliases:
26- - parec
27+ # NOTE: This is deprecated with snapd 2.25 but needs to stay to
28+ # guarantee all clients are updated correctly.
29+ aliases: [parec]
30 config:
31 command: bin/config
32
33diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
34index aa8e52e..08c0b8c 100644
35--- a/tests/lib/utilities.sh
36+++ b/tests/lib/utilities.sh
37@@ -22,8 +22,13 @@ install_snap_under_test() {
38 snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
39 fi
40 if [ -n "$SNAP_AUTO_ALIASES" ]; then
41+ snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
42 for alias in $SNAP_AUTO_ALIASES ; do
43- snap alias $SNAP_NAME $alias
44+ target=$SNAP_NAME.$alias
45+ if dpkg --compare-versions $snapd_version lt 2.25 ; then
46+ target=$SNAP_NAME
47+ fi
48+ snap alias $target $alias
49 done
50 fi
51 }

Subscribers

People subscribed via source and target branches