summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-11-12 15:26:19 -0500
committerScott Moser <smoser@ubuntu.com>2012-11-12 15:26:19 -0500
commit90af12849c373d3b729c4d7d84dbb69c2ecd885a (patch)
treed60cda74cdc8a33ac909f6fb8cee06ab0e8b29e6 /cloudinit
parent4944bc286970da1ca59b7d57509e51b6817c60c2 (diff)
downloadvyos-cloud-init-90af12849c373d3b729c4d7d84dbb69c2ecd885a.tar.gz
vyos-cloud-init-90af12849c373d3b729c4d7d84dbb69c2ecd885a.zip
change the "null datasource" for stages.py to None
Previous commit set up an object for checking "None" in the stages class. Here, change that to be None. The benefit of the DataSourceNone was so that the stages was generally functional even with that "None" object. The negative affect of that is that you could go down the error path much longer when using it. If we use None type, then self.datasource.<something> will fail immediately and loudly.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/stages.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 9c231994..e83d72da 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -49,7 +49,7 @@ from cloudinit import util
LOG = logging.getLogger(__name__)
-NULL_DATA_SOURCE = DataSourceNone.DataSourceNone({}, None, None)
+NULL_DATA_SOURCE = None
class Init(object):
def __init__(self, ds_deps=None):