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
diff --git a/units/wireless/wifi-ap.pxu b/units/wireless/wifi-ap.pxu
index b3ed7f0..df25b50 100644
--- a/units/wireless/wifi-ap.pxu
+++ b/units/wireless/wifi-ap.pxu
@@ -632,7 +632,7 @@ command:
632 nmcli dev wifi rescan632 nmcli dev wifi rescan
633 echo "Connecting to existing network"633 echo "Connecting to existing network"
634 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX634 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
635 trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT635 trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
636 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then636 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
637 echo "FAILED to connect to STA before setting up AP"637 echo "FAILED to connect to STA before setting up AP"
638 exit 1638 exit 1
@@ -720,7 +720,7 @@ command:
720 nmcli dev wifi rescan720 nmcli dev wifi rescan
721 echo "Connecting to existing network"721 echo "Connecting to existing network"
722 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX722 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
723 trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT723 trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
724 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then724 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
725 echo "FAILED to connect to STA before setting up AP"725 echo "FAILED to connect to STA before setting up AP"
726 exit 1726 exit 1
@@ -808,7 +808,7 @@ command:
808 nmcli dev wifi rescan808 nmcli dev wifi rescan
809 echo "Connecting to existing network"809 echo "Connecting to existing network"
810 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX810 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
811 trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT811 trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
812 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then812 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
813 echo "FAILED to connect to STA before setting up AP"813 echo "FAILED to connect to STA before setting up AP"
814 exit 1814 exit 1
@@ -896,7 +896,7 @@ command:
896 nmcli dev wifi rescan896 nmcli dev wifi rescan
897 echo "Connecting to existing network"897 echo "Connecting to existing network"
898 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX898 nmcli dev wifi connect $OPEN_BG_SSID ifname {interface} name WIFI_TEST_CREATED_BY_CHECKBOX
899 trap "nmcli dev disconnect { interface }; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT899 trap "nmcli dev disconnect {interface}; nmcli con delete id WIFI_TEST_CREATED_BY_CHECKBOX" EXIT
900 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then900 if ! nmcli -m tabular -t -f GENERAL.STATE d show {interface} |grep ^100 ; then
901 echo "FAILED to connect to STA before setting up AP"901 echo "FAILED to connect to STA before setting up AP"
902 exit 1902 exit 1

Subscribers

People subscribed via source and target branches