From 5126a58af832d55dca48442f96857fafa55bd41f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 12 Jun 2024 09:36:54 +0200
Subject: [PATCH] deploy: rclone_config always as list to avoid code
 duplication

---
 fdroidserver/deploy.py | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py
index b982f816..0d466245 100644
--- a/fdroidserver/deploy.py
+++ b/fdroidserver/deploy.py
@@ -299,8 +299,13 @@ def update_remote_storage_with_rclone(
     else:
         sources = [repo_section]
 
+    if isinstance(config['rclone_config'], str):
+        rclone_config = [config['rclone_config']]
+    else:
+        rclone_config = config['rclone_config']
+
     for source in sources:
-        if isinstance(config['rclone_config'], str):
+        for remote_config in rclone_config:
             rclone_sync_command = (
                 'rclone sync '
                 + source
@@ -333,40 +338,6 @@ def update_remote_storage_with_rclone(
             if subprocess.call(rclone_sync_command) != 0:
                 raise FDroidException()
 
-        if isinstance(config['rclone_config'], list):
-            for remote_config in config['rclone_config']:
-                rclone_sync_command = (
-                    'rclone sync '
-                    + source
-                    + ' '
-                    + remote_config
-                    + ':'
-                    + config['awsbucket']
-                    + '/'
-                    + upload_dir
-                )
-
-                rclone_sync_command = split(rclone_sync_command)
-
-                if verbose:
-                    rclone_sync_command += ['--verbose']
-                elif quiet:
-                    rclone_sync_command += ['--quiet']
-
-                if configfilename:
-                    rclone_sync_command += split('--config=' + configfilename)
-
-                complete_remote_path = (
-                    remote_config + ':' + config['awsbucket'] + '/' + upload_dir
-                )
-
-                logging.debug(
-                    "rclone sync all files in " + source + ' to ' + complete_remote_path
-                )
-
-                if subprocess.call(rclone_sync_command) != 0:
-                    raise FDroidException()
-
 
 def update_awsbucket_libcloud(repo_section, is_index_only=False):
     """No summary.