1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-11 01:40:11 +01:00

Merge branch 'fix-subprocess-checkoutput-on-rclone' into 'master'

fix: subprocess.check_output to produce string and not bytes

See merge request fdroid/fdroidserver!1490
This commit is contained in:
Hans-Christoph Steiner 2024-06-12 06:31:49 +00:00
commit aeb8a7a3e5

View File

@ -271,7 +271,7 @@ def update_remote_storage_with_rclone(
logging.info('Custom configuration not found.')
logging.info(
'Using default configuration at {}'.format(
subprocess.check_output('rclone config file')
subprocess.check_output(split("rclone config file")).decode("utf-8")
)
)
configfilename = None
@ -280,7 +280,7 @@ def update_remote_storage_with_rclone(
logging.info('Custom configuration not found.')
logging.info(
'Using default configuration at {}'.format(
subprocess.check_output('rclone config file')
subprocess.check_output(split("rclone config file")).decode("utf-8")
)
)
configfilename = None