mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: subprocess.check_output to produce string and not bytes

Browse source
This commit is contained in:
pmmayero 2024-06-05 20:37:48 +03:00 • committed by Hans-Christoph Steiner
parent 21e03e62a8
commit 3f59d0908f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/deploy.py
View file

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