kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Change exception syntax to be more modern and hopefully fix buildbot issue in the process

Browse Source
This commit is contained in:
Martijn Berger 2015-01-26 08:48:55 +01:00
parent 5d61cbf008
commit 9415976d17
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/buildbot/master_unpack.py
View File

@ -93,7 +93,7 @@ if not os.path.exists(filename):
try: try:
z = zipfile.ZipFile(filename, "r") z = zipfile.ZipFile(filename, "r")
except Exception, ex: except Exception as ex:
sys.stderr.write('Failed to open zip file: %s\n' % str(ex)) sys.stderr.write('Failed to open zip file: %s\n' % str(ex))
sys.exit(1) sys.exit(1)
@ -129,7 +129,7 @@ try:
zf.close() zf.close()
z.close() z.close()
except Exception, ex: except Exception as ex:
sys.stderr.write('Failed to unzip package: %s\n' % str(ex)) sys.stderr.write('Failed to unzip package: %s\n' % str(ex))
sys.exit(1) sys.exit(1)
@ -139,6 +139,6 @@ try:
if get_platform(f) == platform and get_branch(f) == branch: if get_platform(f) == platform and get_branch(f) == branch:
if f != packagename: if f != packagename:
os.remove(os.path.join(directory, f)) os.remove(os.path.join(directory, f))
except Exception, ex: except Exception as ex:
sys.stderr.write('Failed to remove old packages: %s\n' % str(ex)) sys.stderr.write('Failed to remove old packages: %s\n' % str(ex))
sys.exit(1) sys.exit(1)

6
build_files/buildbot/slave_pack.py
View File

@ -133,7 +133,7 @@ else:
z.write("{}.zip".format(builder)) z.write("{}.zip".format(builder))
z.close() z.close()
sys.exit(retcode) sys.exit(retcode)
except Exception, ex: except Exception as ex:
sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n') sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
sys.exit(1) sys.exit(1)
@ -149,7 +149,7 @@ if os.path.exists(release_dir):
# create release package # create release package
try: try:
subprocess.call(['make', 'package_archive']) subprocess.call(['make', 'package_archive'])
except Exception, ex: except Exception as ex:
sys.stderr.write('Make package release failed' + str(ex) + '\n') sys.stderr.write('Make package release failed' + str(ex) + '\n')
sys.exit(1) sys.exit(1)
@ -180,6 +180,6 @@ try:
z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED) z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)
z.write(filepath, arcname=file) z.write(filepath, arcname=file)
z.close() z.close()
except Exception, ex: except Exception as ex:
sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n') sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
sys.exit(1) sys.exit(1)