diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
| commit | 81156aa423309c72f17709eea994e7e06ebc431c (patch) | |
| tree | 4ee78fb024c5f03a3c12e39e1adfc1b0cb84063b /cloudinit/user_data.py | |
| parent | 14040a9c8df6e8406acb79fd653873bb05cb4d40 (diff) | |
| parent | ea4bc2c603a9d964a918e01d00e39a851e979830 (diff) | |
| download | vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.tar.gz vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.zip | |
rebased with upstream and reolved merge conflicts
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: |