diff options
| author | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
|---|---|---|
| committer | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
| commit | 69d6195ec6a37dc7a8f045fc262c74d01624eb56 (patch) | |
| tree | 303ed83b05fdac41604ff3ad7c83c8c8046462eb /cloudinit/DataSourceNoCloud.py | |
| parent | f52ffe2dda01dd0314523fcac559e6f3fbb3578e (diff) | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| download | vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.tar.gz vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.zip | |
Merge from trunk.
Diffstat (limited to 'cloudinit/DataSourceNoCloud.py')
| -rw-r--r-- | cloudinit/DataSourceNoCloud.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cloudinit/DataSourceNoCloud.py b/cloudinit/DataSourceNoCloud.py index 956b1a5e..2f4bd604 100644 --- a/cloudinit/DataSourceNoCloud.py +++ b/cloudinit/DataSourceNoCloud.py @@ -18,12 +18,8 @@ import DataSource -from cloudinit import seeddir, log +from cloudinit import seeddir, log # pylint: disable=W0611 import cloudinit.util as util -import sys -import os.path -import os -import errno class DataSourceNoCloud(DataSource.DataSource): metadata = None @@ -94,7 +90,7 @@ class DataSourceNoCloud(DataSource.DataSource): md = util.mergedict(md,defaults) self.seed = ",".join(found) - self.metadata = md; + self.metadata = md self.userdata_raw = ud return True |