Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update makedirs function to not supress OSErrors #3404

Open
wants to merge 6 commits into
base: proton_4.11
Choose a base branch
from
Open

Update makedirs function to not supress OSErrors #3404

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c2bd15
proton: Check if directory exists before attempting to create
SkyLeite Jan 3, 2020
02d0377
proton: Add error logging in makedirs
SkyLeite Jan 3, 2020
eb08e1f
proton: Standardize use of makedirs
SkyLeite Jan 3, 2020
09be8ef
proton: Check if directory is empty before removing and log OSError
SkyLeite Jan 4, 2020
da569c1
proton: Use scandir to check if directory is empty
SkyLeite Jan 6, 2020
644a257
Raise error instead of manually logging
SkyLeite Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions proton
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ def file_is_wine_fake_dll(path):

def makedirs(path):
try:
if os.path.lexists(path):
return

os.makedirs(path)
except OSError:
#already exists
except OSError as err:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use FileExistsError instead of OSError

log("Error when creating directory {0}: {1}".format(path, err))
pass

def try_copy(src, dst):
Expand Down Expand Up @@ -165,9 +168,10 @@ class CompatData:
dirs.append(path)
for d in dirs:
try:
os.rmdir(d)
except OSError:
#not empty
if not any(os.scandir(d)):
os.rmdir(d)
except OSError as err:
Copy link
Contributor

@nanonyme nanonyme Jan 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead

except OSError as e:
    if e.errno != errno.ENOTEMPTY:
      raise

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I could gather checking if the directory is empty before attempting to do the operation is less expensive than letting it throw an exception and catching it. Would we still prefer going with the latter approach?

Copy link
Contributor

@nanonyme nanonyme Jan 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no measurable performance difference between the two (although the deletion and seeing whether it fails is most likely faster as it results in less syscalls on average) but with the exception handling race conditions are impossible. That's typically recommended way to handle these things.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. I hadn't considered race conditions. I'll make the changes in a bit :)

log("Error deleting directory {0}: {1}".format(d, err))
pass

os.remove(self.tracked_files_file)
Expand Down Expand Up @@ -257,7 +261,7 @@ class CompatData:
rel_dir = rel_dir + "/"
dst_dir = src_dir.replace(g_proton.default_pfx_dir, self.prefix_dir, 1)
if not os.path.exists(dst_dir):
os.makedirs(dst_dir)
makedirs(dst_dir)
tracked_files.write(rel_dir + "\n")
for dir_ in dirs:
src_file = os.path.join(src_dir, dir_)
Expand Down