Merge branch 'master' into wait-for-network

src/vorta/_version.py

@@ -1 +1 @@
-__version__ = "0.10.2"
+__version__ = "0.10.3"

src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml

@@ -42,7 +42,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="v0.10.2" date="2024-12-05" urgency="low">
+    <release version="v0.10.3" date="2024-12-23" urgency="low">
       <description>
         See Github for detailed release notes: github.com/borgbase/vorta/releases
       </description>

src/vorta/borg/borg_job.py

@@ -234,7 +234,9 @@ def run(self):
                 profile=self.params.get('profile_id', None),
             )
             log_entry.save()
-            logger.info('Running command %s', ' '.join(self.cmd))
+            cmd_log_tmp = [s.replace(" ", "\\ ") for s in self.cmd]  # escape whitespace - for logs
+            logger.info('Running command %s', ' '.join(cmd_log_tmp))
+            del cmd_log_tmp
 
         p = Popen(
             self.cmd,

src/vorta/borg/create.py

@@ -1,4 +1,5 @@
 import os
+import shlex
 import subprocess
 import tempfile
 from datetime import datetime as dt
@@ -102,8 +103,8 @@ def prepare(cls, profile):
         suffix_command = []
         if profile.repo.create_backup_cmd:
             s1, sep, s2 = profile.repo.create_backup_cmd.partition('-- ')
-            extra_cmd_options = s1.split()
-            suffix_command = (sep + s2).split()
+            extra_cmd_options = shlex.split(s1)
+            suffix_command = shlex.split(sep + s2)
 
         if n_backup_folders == 0 and '--paths-from-command' not in extra_cmd_options:
             ret['message'] = trans_late('messages', 'Add some folders to back up first.')