diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
| commit | cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b (patch) | |
| tree | e9bdcbc699eda6db5e57d35b25d222bead96da12 /cloudinit/sources/DataSourceOVF.py | |
| parent | fbfd3789ede42ad50e0b79f202ab18b65537af52 (diff) | |
| parent | e39abc783f7edd6435dbc7ea1fc3d02e6b3955d3 (diff) | |
| download | vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.tar.gz vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceOVF.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index 77b43e17..2f53c1ba 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -107,7 +107,7 @@ class DataSourceOVF(sources.DataSource): return True def get_public_ssh_keys(self): - if not 'public-keys' in self.metadata: + if 'public-keys' not in self.metadata: return [] pks = self.metadata['public-keys'] if isinstance(pks, (list)): @@ -205,7 +205,7 @@ def transport_iso9660(require_iso=True): fullp = os.path.join("/dev/", dev) if (fullp in mounts or - not cdmatch.match(dev) or os.path.isdir(fullp)): + not cdmatch.match(dev) or os.path.isdir(fullp)): continue try: |