Repository navigation
Commit 60f7f94
committed
Fix mkdir race condition in LooseObjectDB.store
This replaces the conditional call to os.mkdir that raises an
unintended FileExistsError if the directory is created between the
check and the os.mkdir call, using a single os.makedirs call
instead, with exist_ok=True.
This way, we attempt creation in a way that produces no error if
the directory is already present, while still raising
FileExistsError if a non-directory filesystem entry (such as a
regular file) is present where we want the directory to be.1 parent d22ac20 commit 60f7f94
1 file changed
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,7 +8,6 @@ | |||
| 8 | 8 | ObjectDBW | |
| 9 | 9 | ) | |
| 10 | 10 | ||
| 11 | - | ||
| 12 | 11 | from gitdb.exc import ( | |
| 13 | 12 | BadObject, | |
| 14 | 13 | AmbiguousObjectName | |
@@ -33,10 +32,8 @@ | |||
| 33 | 32 | bin_to_hex, | |
| 34 | 33 | exists, | |
| 35 | 34 | chmod, | |
| 36 | - isdir, | ||
| 37 | 35 | isfile, | |
| 38 | 36 | remove, | |
| 39 | - mkdir, | ||
| 40 | 37 | rename, | |
| 41 | 38 | dirname, | |
| 42 | 39 | basename, | |
@@ -222,8 +219,7 @@ def store(self, istream): | |||
| 222 | 219 | if tmp_path: | |
| 223 | 220 | obj_path = self.db_path(self.object_path(hexsha)) | |
| 224 | 221 | obj_dir = dirname(obj_path) | |
| 225 | - if not isdir(obj_dir): | ||
| 226 | - mkdir(obj_dir) | ||
| 222 | + os.makedirs(obj_dir, exist_ok=True) | ||
| 227 | 223 | # END handle destination directory | |
| 228 | 224 | # rename onto existing doesn't work on NTFS | |
| 229 | 225 | if isfile(obj_path): | |
0 commit comments