|
@@ -89,7 +89,10 @@ def auth_error_handler(view_fn):
|
|
|
def get_s3_home_directory(user=None):
|
|
def get_s3_home_directory(user=None):
|
|
|
from desktop.models import _handle_user_dir_raz
|
|
from desktop.models import _handle_user_dir_raz
|
|
|
|
|
|
|
|
- remote_home_s3 = REMOTE_STORAGE_HOME.get() if hasattr(REMOTE_STORAGE_HOME, 'get') and REMOTE_STORAGE_HOME.get() else 's3a://'
|
|
|
|
|
|
|
+ remote_home_s3 = 's3a://'
|
|
|
|
|
+ if hasattr(REMOTE_STORAGE_HOME, 'get') and REMOTE_STORAGE_HOME.get() and REMOTE_STORAGE_HOME.get().startswith('s3a://'):
|
|
|
|
|
+ remote_home_s3 = REMOTE_STORAGE_HOME.get()
|
|
|
|
|
+
|
|
|
remote_home_s3 = _handle_user_dir_raz(user, remote_home_s3)
|
|
remote_home_s3 = _handle_user_dir_raz(user, remote_home_s3)
|
|
|
|
|
|
|
|
return remote_home_s3
|
|
return remote_home_s3
|