From 36967e23096701f00dbe42880d239e03dcf4e395 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 15 Sep 2016 21:29:03 +1200
Subject: [PATCH] Do not write any config for a wlan device that has not been
 given a ESSID

See https://bugs.launchpad.net/ubuntu/+source/subiquity/+bug/1623756
---
 subiquitycore/models/network.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/subiquitycore/models/network.py b/subiquitycore/models/network.py
index 92ae537d..0eb9b3d9 100644
--- a/subiquitycore/models/network.py
+++ b/subiquitycore/models/network.py
@@ -105,9 +105,9 @@ class Networkdev():
     def render(self):
         log.debug("render to YAML")
         result = { self.ifname:
-                   { 
+                   {
                      'addresses': self.ipv4_addresses + self.ipv6_addresses,
-                   } 
+                   }
                  }
 
         if self.dhcp4:
@@ -119,13 +119,14 @@ class Networkdev():
             result[self.ifname]['interfaces'] = self.probe_info.bond['slaves']
 
         if self.iftype == 'wlan':
-            if self.essid is not None:
-                aps = result[self.ifname]['access-points'] = {}
-                ap = aps[self.essid] = {
-                    'mode': 'infrastructure',
-                    }
-                if self.wpa_psk is not None:
-                    ap['password'] = self.wpa_psk
+            if self.essid is None:
+                return {}
+            aps = result[self.ifname]['access-points'] = {}
+            ap = aps[self.essid] = {
+                'mode': 'infrastructure',
+                }
+            if self.wpa_psk is not None:
+                ap['password'] = self.wpa_psk
 
         return result