Skip to content

Commit 768ef58

Browse files
committed
Added checks and exception messages for removing temporary directories.
1 parent 270642f commit 768ef58

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

command_line.py

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,18 +662,32 @@ def make_output_dirs(self):
662662

663663
output_dir = utils.path_join(self.output_dir(), self.project_name())
664664
if os.path.exists(output_dir):
665-
utils.rmtree(output_dir, ignore_errors=True)
665+
try:
666+
utils.rmtree(output_dir)
667+
except OSError as e:
668+
error = u'Failed to remove output directory: {}.'.format(output_dir)
669+
error += '\nError recieved: {}'.format(e)
670+
self.logger.error(error)
671+
self.output_err += error
666672

667673
temp_dir = utils.path_join(TEMP_DIR, 'webexectemp')
674+
668675
if os.path.exists(temp_dir):
669-
utils.rmtree(temp_dir, ignore_errors=True)
676+
try:
677+
utils.rmtree(temp_dir)
678+
except OSError as e:
679+
error = u'Failed to remove temporary directory: {}.'.format(temp_dir)
680+
error += '\nError recieved: {}'.format(e)
681+
self.logger.error(error)
682+
self.output_err += error
670683

671684
self.progress_text = 'Making new directories...\n'
672685

673686
if not os.path.exists(output_dir):
674687
os.makedirs(output_dir)
675688

676-
os.makedirs(temp_dir)
689+
if not os.path.exists(temp_dir):
690+
os.makedirs(temp_dir)
677691

678692
self.copy_files_to_project_folder()
679693

@@ -806,7 +820,13 @@ def make_output_dirs(self):
806820
self.logger.error(error)
807821
self.output_err += error
808822
finally:
809-
utils.rmtree(temp_dir, ignore_errors=True)
823+
try:
824+
utils.rmtree(temp_dir)
825+
except OSError as e:
826+
error = u'Failed to remove temporary directory: {}.'.format(temp_dir)
827+
error += '\nError recieved: {}'.format(e)
828+
self.logger.error(error)
829+
self.output_err += error
810830

811831
def make_desktop_file(self, nw_path, export_dest):
812832
icon_set = self.get_setting('icon')

0 commit comments

Comments
 (0)