Provider for Plainbox - Snappy

Merge ~jocave/plainbox-provider-snappy:bad-template-params into plainbox-provider-snappy:master

  1. Git
  2. lp:~jocave/plainbox-provider-snappy
  3. bad-template-params
  4. Merge into master
Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: 5fa11ff7bba51db1e477a18642acc30d50791974
Merged at revision: 4f1847ead24d187bb3af1b97697471c75f2f2d57
Proposed branch: ~jocave/plainbox-provider-snappy:bad-template-params
Merge into: plainbox-provider-snappy:master
Diff against target: 40 lines (+4/-4)
1 file modified
units/wireless/wifi-ap.pxu (+4/-4)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+369868@code.launchpad.net

Description of the change

Fix case where non-jinja2 template field included spaces around the variable name.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/wireless/wifi-ap.pxu b/units/wireless/wifi-ap.pxu
2index b3ed7f0..df25b50 100644
3--- a/units/wireless/wifi-ap.pxu
4+++ b/units/wireless/wifi-ap.pxu
5@@ -632,7 +632,7 @@ command:
6 nmcli dev wifi rescan
7 echo "Connecting to existing network"
8 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
9- trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
10+ trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
11 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
12 echo "FAILED to connect to STA before setting up AP"
13 exit 1
14@@ -720,7 +720,7 @@ command:
15 nmcli dev wifi rescan
16 echo "Connecting to existing network"
17 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
18- trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
19+ trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
20 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
21 echo "FAILED to connect to STA before setting up AP"
22 exit 1
23@@ -808,7 +808,7 @@ command:
24 nmcli dev wifi rescan
25 echo "Connecting to existing network"
26 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
27- trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
28+ trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
29 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
30 echo "FAILED to connect to STA before setting up AP"
31 exit 1
32@@ -896,7 +896,7 @@ command:
33 nmcli dev wifi rescan
34 echo "Connecting to existing network"
35 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
36- trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
37+ trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
38 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
39 echo "FAILED to connect to STA before setting up AP"
40 exit 1

Subscribers

People subscribed via source and target branches