diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-05-27 09:55:10 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-05-27 09:55:10 -0400 |
| commit | 318bd66461cba2f480b2ef6be119d2fcd5c6e9c0 (patch) | |
| tree | 1817b310efc0190c92c5c95b15df6491119233ce /cloudinit/user_data.py | |
| parent | 949cebd48c9100d4fd00b74232bcf048980e6e0d (diff) | |
| parent | 0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff) | |
| download | vyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.tar.gz vyos-cloud-init-318bd66461cba2f480b2ef6be119d2fcd5c6e9c0.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/user_data.py')
| -rw-r--r-- | cloudinit/user_data.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py index f7c5787c..f0631906 100644 --- a/cloudinit/user_data.py +++ b/cloudinit/user_data.py @@ -178,7 +178,7 @@ class UserDataProcessor(object): payload = util.load_yaml(msg.get_payload(decode=True)) if payload: payload_idx = payload.get('launch-index') - except: + except Exception: pass # Header overrides contents, for now (?) or the other way around? if header_idx is not None: |