kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-10 17:30:11 +01:00
Code Activity

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

Browse Source 
Draft: fix: subprocess.check_output to produce string and not bytes

See merge request fdroid/fdroidserver!1490
This commit is contained in:
paul mayero 2024-06-07 11:02:23 +00:00
commit 59039e9fa2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/deploy.py
View File

@ -237,19 +237,21 @@ def update_remote_storage_with_rclone(repo_section, verbose=False, quiet=False):
)
configfilename = USER_RCLONE_CONF
else:
rclone_conf_str = split("rclone config file")
logging.info('Custom configuration not found.')
logging.info(
'Using default configuration at {}'.format(
subprocess.check_output('rclone config file')
subprocess.check_output(rclone_conf_str).decode("utf-8")
)
)
configfilename = None
else:
rclone_conf_str = split("rclone config file")
logging.warning("'path_to_custom_rclone_config' not found in config.yml")
logging.info('Custom configuration not found.')
logging.info(
'Using default configuration at {}'.format(
subprocess.check_output('rclone config file')
subprocess.check_output(rclone_conf_str).decode("utf-8")
)
)
configfilename = None