diff options
| author | Vlastimil Holer <vlastimil.holer@gmail.com> | 2012-12-20 15:17:32 +0100 |
|---|---|---|
| committer | Vlastimil Holer <vlastimil.holer@gmail.com> | 2012-12-20 15:17:32 +0100 |
| commit | 46e646fabf3a0f2593dc9d9f231fd075134de36f (patch) | |
| tree | e3124820da3f0a2843c0af9d079ff93e1c658d8e /cloudinit/sources | |
| parent | 21d3a5af7d2e1884009cfd1ad650a937438f5991 (diff) | |
| download | vyos-cloud-init-46e646fabf3a0f2593dc9d9f231fd075134de36f.tar.gz vyos-cloud-init-46e646fabf3a0f2593dc9d9f231fd075134de36f.zip | |
Change subp exception handling to util.ProcessExecutionError
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py index a50b0c10..967d7170 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -208,8 +208,8 @@ def read_context_disk_dir(source_dir): else: # simple values context_sh[key.lower()]=value - except subprocess.CalledProcessError as exc: - LOG.warn("context script faled to read" % (exc.output[1])) + except util.ProcessExecutionError, _err: + LOG.warn("Failed to read context variables: %s" % (_err.message)) results['metadata']=context_sh # process single or multiple SSH keys |