maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix errors when attempting to set UNIX permissions when unavailable

Browse source 
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) {
return FAILED;
ERR_PRINT("Setting UNIX permissions on encrypted files is not implemented yet");
return ERR_UNAVAILABLE;
}
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) {
//could be implemented, not sure if worth it
ERR_PRINT("Getting UNIX permissions from network drives is not implemented yet");
return 0;
}
Error FileAccessNetwork::_set_unix_permissions(const String &p_file, uint32_t p_permissions) {
return FAILED;
ERR_PRINT("Setting UNIX permissions on network drives is not implemented yet");
return ERR_UNAVAILABLE;
}
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) {
ERR_PRINT("Windows does not support unix permissions");
return 0;
}
Error FileAccessWindows::_set_unix_permissions(const String &p_file, uint32_t p_permissions) {
ERR_PRINT("Windows does not support unix permissions");
return FAILED;
return ERR_UNAVAILABLE;
}
FileAccessWindows::FileAccessWindows() :