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
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 605243c..736791d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -19,18 +19,21 @@ apps:
19 pactl:19 pactl:
20 command: bin/client-wrapper usr/bin/pactl20 command: bin/client-wrapper usr/bin/pactl
21 plugs: [client, network]21 plugs: [client, network]
22 aliases:22 # NOTE: This is deprecated with snapd 2.25 but needs to stay to
23 - pactl23 # guarantee all clients are updated correctly.
24 aliases: [pactl]
24 paplay:25 paplay:
25 command: bin/client-wrapper usr/bin/paplay26 command: bin/client-wrapper usr/bin/paplay
26 plugs: [client, home, network]27 plugs: [client, home, network]
27 aliases:28 # NOTE: This is deprecated with snapd 2.25 but needs to stay to
28 - paplay29 # guarantee all clients are updated correctly.
30 aliases: [paplay]
29 parec:31 parec:
30 command: bin/client-wrapper usr/bin/parec32 command: bin/client-wrapper usr/bin/parec
31 plugs: [client, home, network]33 plugs: [client, home, network]
32 aliases:34 # NOTE: This is deprecated with snapd 2.25 but needs to stay to
33 - parec35 # guarantee all clients are updated correctly.
36 aliases: [parec]
34 config:37 config:
35 command: bin/config38 command: bin/config
3639
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index aa8e52e..08c0b8c 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -22,8 +22,13 @@ install_snap_under_test() {
22 snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap22 snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
23 fi23 fi
24 if [ -n "$SNAP_AUTO_ALIASES" ]; then24 if [ -n "$SNAP_AUTO_ALIASES" ]; then
25 snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
25 for alias in $SNAP_AUTO_ALIASES ; do26 for alias in $SNAP_AUTO_ALIASES ; do
26 snap alias $SNAP_NAME $alias27 target=$SNAP_NAME.$alias
28 if dpkg --compare-versions $snapd_version lt 2.25 ; then
29 target=$SNAP_NAME
30 fi
31 snap alias $target $alias
27 done32 done
28 fi33 fi
29}34}

Subscribers

People subscribed via source and target branches

to all changes: