jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Added checks and exception messages for removing temporary directories.

Browse source
This commit is contained in:
Joey Payne 2016-01-25 07:01:48 -07:00
commit 768ef58434
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
command_line.py
View file

@ -662,17 +662,31 @@ class CommandBase(object):
output_dir = utils.path_join(self.output_dir(), self.project_name()) output_dir = utils.path_join(self.output_dir(), self.project_name())
if os.path.exists(output_dir): if os.path.exists(output_dir):
utils.rmtree(output_dir, ignore_errors=True) try:
utils.rmtree(output_dir)
except OSError as e:
error = u'Failed to remove output directory: {}.'.format(output_dir)
error += '\nError recieved: {}'.format(e)
self.logger.error(error)
self.output_err += error
temp_dir = utils.path_join(TEMP_DIR, 'webexectemp') temp_dir = utils.path_join(TEMP_DIR, 'webexectemp')
if os.path.exists(temp_dir): if os.path.exists(temp_dir):
utils.rmtree(temp_dir, ignore_errors=True) try:
utils.rmtree(temp_dir)
except OSError as e:
error = u'Failed to remove temporary directory: {}.'.format(temp_dir)
error += '\nError recieved: {}'.format(e)
self.logger.error(error)
self.output_err += error
self.progress_text = 'Making new directories...\n' self.progress_text = 'Making new directories...\n'
if not os.path.exists(output_dir): if not os.path.exists(output_dir):
os.makedirs(output_dir) os.makedirs(output_dir)
if not os.path.exists(temp_dir):
os.makedirs(temp_dir) os.makedirs(temp_dir)
self.copy_files_to_project_folder() self.copy_files_to_project_folder()
@ -806,7 +820,13 @@ class CommandBase(object):
self.logger.error(error) self.logger.error(error)
self.output_err += error self.output_err += error
finally: finally:
utils.rmtree(temp_dir, ignore_errors=True) try:
utils.rmtree(temp_dir)
except OSError as e:
error = u'Failed to remove temporary directory: {}.'.format(temp_dir)
error += '\nError recieved: {}'.format(e)
self.logger.error(error)
self.output_err += error
def make_desktop_file(self, nw_path, export_dest): def make_desktop_file(self, nw_path, export_dest):
icon_set = self.get_setting('icon') icon_set = self.get_setting('icon')