1
diff --git a/snapcraft.yaml b/snapcraft.yaml
2
index 605243c..736791d 100644
3
--- a/snapcraft.yaml
4
+++ b/snapcraft.yaml
5
@@ -19,18 +19,21 @@ apps:
6
19
  pactl:
19
  pactl:
7
20
    command: bin/client-wrapper usr/bin/pactl
20
    command: bin/client-wrapper usr/bin/pactl
8
21
    plugs: [client, network]
21
    plugs: [client, network]
11
22
    aliases:
22
    # NOTE: This is deprecated with snapd 2.25 but needs to stay to
12
23
      - pactl
23
    # guarantee all clients are updated correctly.
13
24
    aliases: [pactl]
14
24
  paplay:
25
  paplay:
15
25
    command: bin/client-wrapper usr/bin/paplay
26
    command: bin/client-wrapper usr/bin/paplay
16
26
    plugs: [client, home, network]
27
    plugs: [client, home, network]
19
27
    aliases:
28
    # NOTE: This is deprecated with snapd 2.25 but needs to stay to
20
28
      - paplay
29
    # guarantee all clients are updated correctly.
21
30
    aliases: [paplay]
22
29
  parec:
31
  parec:
23
30
    command: bin/client-wrapper usr/bin/parec
32
    command: bin/client-wrapper usr/bin/parec
24
31
    plugs: [client, home, network]
33
    plugs: [client, home, network]
27
32
    aliases:
34
    # NOTE: This is deprecated with snapd 2.25 but needs to stay to
28
33
      - parec
35
    # guarantee all clients are updated correctly.
29
36
    aliases: [parec]
30
34
  config:
37
  config:
31
35
    command: bin/config
38
    command: bin/config
32
36
39
33
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
34
index 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
22
		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
22
		snap install --dangerous ${PROJECT_PATH}/${SNAP_NAME}_*_${SNAP_ARCH}.snap
39
23
	fi
23
	fi
40
24
	if [ -n "$SNAP_AUTO_ALIASES" ]; then
24
	if [ -n "$SNAP_AUTO_ALIASES" ]; then
41
25
		snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
42
25
		for alias in $SNAP_AUTO_ALIASES ; do
26
		for alias in $SNAP_AUTO_ALIASES ; do
44
26
			snap alias $SNAP_NAME $alias
27
			target=$SNAP_NAME.$alias
45
28
			if dpkg --compare-versions $snapd_version lt 2.25 ; then
46
29
				target=$SNAP_NAME
47
30
			fi
48
31
			snap alias $target $alias
49
27
		done
32
		done
50
28
	fi
33
	fi
51
29
}
34
}
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)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration	2017-05-10	Approve on 2017-05-11
Jim Hodapp (community)			Needs Fixing on 2017-05-10
Konrad Zapałowicz (community)	code		Approve on 2017-05-10
Review via email: mp+323847@code.launchpad.net