File 0004-Comment-new-mount-override-setting.patch of Package vorta

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-Comment-new-mount-override-setting.patch of Package vorta

From 5be3279f434f1c9f174de30de0b8b7b78aa0af7e Mon Sep 17 00:00:00 2001
From: Manu <manu@snapdragon.cc>
Date: Thu, 18 Feb 2021 14:30:12 +0800
Subject: [PATCH] Comment new mount override setting.

---
 src/vorta/borg/mount.py |  6 ++++--
 src/vorta/models.py     | 11 +++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/vorta/borg/mount.py b/src/vorta/borg/mount.py
index a5c2c0a89..5d00aa687 100644
--- a/src/vorta/borg/mount.py
+++ b/src/vorta/borg/mount.py
@@ -1,4 +1,4 @@
-from os import getuid
+import os
 from .borg_thread import BorgThread
 from vorta.models import SettingsModel
 
@@ -18,9 +18,11 @@ def prepare(cls, profile):
 
         cmd = ['borg', '--log-json', 'mount']
 
+        # Try to override existing permissions when mounting an archive. May help to read
+        # files that come from a different system, like a restrictive NAS.
         override_mount_permissions = SettingsModel.get(key='override_mount_permissions').value
         if override_mount_permissions:
-            cmd += ['-o', f"umask=0277,uid={getuid()}"]
+            cmd += ['-o', f"umask=0277,uid={os.getuid()}"]
 
         cmd += [f"{profile.repo.url}"]
 
#diff --git a/src/vorta/models.py b/src/vorta/models.py
#index 512d7143d..9ad1db73c 100644
#--- a/src/vorta/models.py
#+++ b/src/vorta/models.py
#@@ -225,6 +225,11 @@ def get_misc_settings():
#             'label': trans_late('settings',
#                                 'Get statistics of file/folder when added')
#         },
#+        {
#+            'key': 'override_mount_permissions', 'value': False, 'type': 'checkbox',
#+            'label': trans_late('settings',
#+                                'Try to replace existing permissions when mounting an archive.')
#+        },
#         {
#             'key': 'previous_profile_id', 'str_value': '1', 'type': 'internal',
#             'label': 'Previously selected profile'
#@@ -237,12 +242,6 @@ def get_misc_settings():
#             'key': 'previous_window_height', 'str_value': '600', 'type': 'internal',
#             'label': 'Previous window height'
#         },
#-        {
#-            'key': 'override_mount_permissions', 'value': False, 'type': 'checkbox',
#-            'label': trans_late('settings',
#-                                'Try to replace existing permissions when mounting an archive.')
#-        },
#-
#     ]
#     if sys.platform == 'darwin':
#         settings += [

Places

File 0004-Comment-new-mount-override-setting.patch of Package vorta

Places