Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix whitespace error: use of shlex.split instead of .split() (fix #2164) #2171

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Fix whitespace error: use of shlex.split instead of .split() (fix #2164) #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/vorta/borg/borg_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions src/vorta/borg/create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import shlex
import subprocess
import tempfile
from datetime import datetime as dt
Expand Down Expand Up @@ -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.')
Expand Down
Loading