summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-09-08 10:17:19 -0400
committerScott Moser <smoser@ubuntu.com>2010-09-08 10:17:19 -0400
commite4b3cddd96380a203f902ccd3f425cadc0c37772 (patch)
treea0327acae28da72f95bc490dc0077d1f56e1b9b0
parentda283d59f4b51d4182f6079392e68709165b65f6 (diff)
downloadvyos-cloud-init-e4b3cddd96380a203f902ccd3f425cadc0c37772.tar.gz
vyos-cloud-init-e4b3cddd96380a203f902ccd3f425cadc0c37772.zip
remove broken (syntax) try/catch in UserDataHandler.py
-rw-r--r--cloudinit/UserDataHandler.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/cloudinit/UserDataHandler.py b/cloudinit/UserDataHandler.py
index cbea7469..ab7d0bc8 100644
--- a/cloudinit/UserDataHandler.py
+++ b/cloudinit/UserDataHandler.py
@@ -46,9 +46,7 @@ def do_include(str,parts):
for line in str.splitlines():
if line == "#include": continue
if line.startswith("#"): continue
- try:
- content = urllib.urlopen(line).read()
- except Exception e:
+ content = urllib.urlopen(line).read()
process_includes(email.message_from_string(decomp_str(content)),parts)
def process_includes(msg,parts):