1
diff --git a/snapcraft.yaml b/snapcraft.yaml
2
index 9e0dcc3..9bf87e2 100644
3
--- a/snapcraft.yaml
4
+++ b/snapcraft.yaml
5
@@ -25,8 +25,7 @@ apps:
6
25
  nmcli:
25
  nmcli:
7
26
    command: usr/bin/nmcli
26
    command: usr/bin/nmcli
8
27
    plugs: [nmcli]
27
    plugs: [nmcli]
11
28
    aliases:
28
    aliases: [nmcli]
10
29
      - nmcli
12
30
  networkmanager:
29
  networkmanager:
13
31
    command: bin/networkmanager
30
    command: bin/networkmanager
14
32
    daemon: simple
31
    daemon: simple
15
@@ -39,8 +38,7 @@ apps:
16
39
    # within the systemd unit file instead for example. Until this
38
    # within the systemd unit file instead for example. Until this
17
40
    # is implemented we keep the alias disabled.
39
    # is implemented we keep the alias disabled.
18
41
    #
40
    #
21
42
    # aliases:
41
    # aliases: [NetworkManager]
20
43
    #   - NetworkManager
22
44
42
23
45
parts:
43
parts:
24
46
  hooks:
44
  hooks:
25
diff --git a/tests/main/aliases/task.yaml b/tests/main/aliases/task.yaml
26
index e2eff9d..f3fd040 100644
27
--- a/tests/main/aliases/task.yaml
28
+++ b/tests/main/aliases/task.yaml
29
@@ -5,7 +5,12 @@ execute: |
30
5
    # have them approved from the store in our snap-declaration assertion.
5
    # have them approved from the store in our snap-declaration assertion.
31
6
    test ! -e /snap/bin/nmcli
6
    test ! -e /snap/bin/nmcli
32
7
7
34
8
    snap alias network-manager nmcli
8
    snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
35
9
    target=$SNAP_NAME.nmcli
36
10
    if dpkg --compare-versions $snapd_version lt 2.25 ; then
37
11
        target=$SNAP_NAME
38
12
    fi
39
13
    snap alias $target nmcli
40
9
14
41
10
    test -e /snap/bin/nmcli
15
    test -e /snap/bin/nmcli
42
11
16
Status:	Merged
Approved by:	Konrad Zapałowicz on 2017-05-15
Approved revision:	5b125d7b699be3dddea19ea41ee3552c83d70f6f
Merged at revision:	e6a2c7606bf7599d5d5bdce3448140f3943418db
Proposed branch:	~morphis/snappy-hwe-snaps/+git/network-manager:f/fix-alias-setup
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target:	41 lines (+8/-5) 2 files modified snapcraft.yaml (+2/-4) tests/main/aliases/task.yaml (+6/-1)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Konrad Zapałowicz (community)	code		Approve on 2017-05-15
System Enablement Bot	continuous-integration	2017-05-12	Approve on 2017-05-12
Review via email: mp+323972@code.launchpad.net