diff options
| author | Timothy Arceri <tarceri@itsqueeze.com> | 2020-05-29 17:02:24 +1000 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-06-01 13:52:17 -0700 |
| commit | bd4c699f935924b0145ea74045c8d1dc9247e660 (patch) | |
| tree | 67df8e7dab9c0af2c3754ec414748340f9ef0f19 | |
| parent | b3098f7dc4536fba18ee8861386ddab3a17d8d3f (diff) | |
radv: fix regression with builtin cache
If the ~/.cache dir already exists continue on without failing.
Fixes: cd61f5234d2c ("radv: Handle failing to create .cache dir.")
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5249>
(cherry picked from commit e843303d6f18d56d7c412e6c879134f7b79372ac)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_meta.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 3efd61b02d2..14bb6435620 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -355,7 +355,7 @@ "description": "radv: fix regression with builtin cache", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "cd61f5234d2c275b21c249fc2effc058a74ecf0a" }, diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index de2f85148a6..cb39c92e903 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -262,7 +262,7 @@ radv_builtin_cache_path(char *path) strcpy(path, pwd.pw_dir); strcat(path, "/.cache"); - if (mkdir(path, 0755)) + if (mkdir(path, 0755) && errno != EEXIST) return false; ret = snprintf(path, PATH_MAX + 1, "%s%s%zd", |