summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2016-09-16 16:12:29 +0200
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-09-19 16:04:22 -0400
commit10a219245e4a68054c93c86bd42483d801d22dca (patch)
tree290dd3ae1c3e68e7260f3bb87531cb0f00ae3c90
parent5e05607ed5c0f31037ee9817f09567a85c732826 (diff)
downloadmeta-cloud-services-10a219245e4a68054c93c86bd42483d801d22dca.tar.gz
openstackchef_inc.bbclass: Update python synthax for except
The synthax used is deprecated and causes errors. Signed-off-by: Adrian Dudau <adrian.dudau@enea.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/classes/openstackchef_inc.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/classes/openstackchef_inc.bbclass b/meta-openstack/classes/openstackchef_inc.bbclass
index b8757be..048fce6 100644
--- a/meta-openstack/classes/openstackchef_inc.bbclass
+++ b/meta-openstack/classes/openstackchef_inc.bbclass
@@ -248,7 +248,7 @@ def deploychef_make_startup_shutdown_list(d):
248 raise bb.build.FuncFailed(msg) 248 raise bb.build.FuncFailed(msg)
249 hStartup.close() 249 hStartup.close()
250 hShutdown.close() 250 hShutdown.close()
251 except IOError, e: 251 except IOError as e:
252 bb.error("Error opening startup/shutdown files %s %s, %s %s" % \ 252 bb.error("Error opening startup/shutdown files %s %s, %s %s" % \
253 (startup_file, shutdown_file, d.getVar('FILE'), e)) 253 (startup_file, shutdown_file, d.getVar('FILE'), e))
254 else: 254 else:
@@ -381,7 +381,7 @@ def deploychef_make_templates( d, conf_tuple=tuple()):
381 deploychef_make_substitutions(d, sub_dict, attr_file, file_name) 381 deploychef_make_substitutions(d, sub_dict, attr_file, file_name)
382 else: 382 else:
383 bb.build.FuncFailed(msg) 383 bb.build.FuncFailed(msg)
384 except IOError, e: 384 except IOError as e:
385 bb.error("Could not write to attribute file %s: in %s, %s" % \ 385 bb.error("Could not write to attribute file %s: in %s, %s" % \
386 (attr_file, d.getVar('FILE'), e)) 386 (attr_file, d.getVar('FILE'), e))
387 387