godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix errors when attempting to set UNIX permissions when unavailable 

This makes exporting from Windows to Linux work again.

This closes #29416.
This commit is contained in:
Hugo Locurcio 2019-06-03 14:20:43 +02:00
parent 1abca62697
commit cbd31d9f0b
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/file_access_encrypted.cpp
View File

@ -308,8 +308,8 @@ uint32_t FileAccessEncrypted::_get_unix_permissions(const String &p_file) {
} }
Error FileAccessEncrypted::_set_unix_permissions(const String &p_file, uint32_t p_permissions) { Error FileAccessEncrypted::_set_unix_permissions(const String &p_file, uint32_t p_permissions) {
ERR_PRINT("Setting UNIX permissions on encrypted files is not implemented yet");
return FAILED; return ERR_UNAVAILABLE;
} }
FileAccessEncrypted::FileAccessEncrypted() { FileAccessEncrypted::FileAccessEncrypted() {

6
core/io/file_access_network.cpp
View File

@ -501,13 +501,13 @@ uint64_t FileAccessNetwork::_get_modified_time(const String &p_file) {
} }
uint32_t FileAccessNetwork::_get_unix_permissions(const String &p_file) { uint32_t FileAccessNetwork::_get_unix_permissions(const String &p_file) {
//could be implemented, not sure if worth it ERR_PRINT("Getting UNIX permissions from network drives is not implemented yet");
return 0; return 0;
} }
Error FileAccessNetwork::_set_unix_permissions(const String &p_file, uint32_t p_permissions) { Error FileAccessNetwork::_set_unix_permissions(const String &p_file, uint32_t p_permissions) {
ERR_PRINT("Setting UNIX permissions on network drives is not implemented yet");
return FAILED; return ERR_UNAVAILABLE;
} }
void FileAccessNetwork::configure() { void FileAccessNetwork::configure() {

4
drivers/windows/file_access_windows.cpp
View File

@ -340,13 +340,11 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
} }
uint32_t FileAccessWindows::_get_unix_permissions(const String &p_file) { uint32_t FileAccessWindows::_get_unix_permissions(const String &p_file) {
ERR_PRINT("Windows does not support unix permissions");
return 0; return 0;
} }
Error FileAccessWindows::_set_unix_permissions(const String &p_file, uint32_t p_permissions) { Error FileAccessWindows::_set_unix_permissions(const String &p_file, uint32_t p_permissions) {
ERR_PRINT("Windows does not support unix permissions"); return ERR_UNAVAILABLE;
return FAILED;
} }
FileAccessWindows::FileAccessWindows() : FileAccessWindows::FileAccessWindows() :