mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	Merge branch 'wire--checksum-to-rclone' into 'master'
deploy: wire up --no-checksum option to rclone functionality See merge request fdroid/fdroidserver!1705
This commit is contained in:
		
						commit
						40fbbd2e48
					
				
					 1 changed files with 15 additions and 2 deletions
				
			
		| 
						 | 
					@ -115,7 +115,12 @@ def update_awsbucket(repo_section, is_index_only=False, verbose=False, quiet=Fal
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def update_remote_storage_with_rclone(
 | 
					def update_remote_storage_with_rclone(
 | 
				
			||||||
    repo_section, awsbucket, is_index_only=False, verbose=False, quiet=False
 | 
					    repo_section,
 | 
				
			||||||
 | 
					    awsbucket,
 | 
				
			||||||
 | 
					    is_index_only=False,
 | 
				
			||||||
 | 
					    verbose=False,
 | 
				
			||||||
 | 
					    quiet=False,
 | 
				
			||||||
 | 
					    checksum=False,
 | 
				
			||||||
):
 | 
					):
 | 
				
			||||||
    """Sync the directory `repo_section` (including subdirectories) to configed cloud services.
 | 
					    """Sync the directory `repo_section` (including subdirectories) to configed cloud services.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -205,6 +210,9 @@ def update_remote_storage_with_rclone(
 | 
				
			||||||
    if configfilename:
 | 
					    if configfilename:
 | 
				
			||||||
        rclone_sync_command += ['--config', configfilename]
 | 
					        rclone_sync_command += ['--config', configfilename]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if checksum:
 | 
				
			||||||
 | 
					        rclone_sync_command.append('--checksum')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if verbose:
 | 
					    if verbose:
 | 
				
			||||||
        rclone_sync_command += ['--verbose']
 | 
					        rclone_sync_command += ['--verbose']
 | 
				
			||||||
    elif quiet:
 | 
					    elif quiet:
 | 
				
			||||||
| 
						 | 
					@ -1141,7 +1149,12 @@ def main():
 | 
				
			||||||
            awsbucket = config['awsbucket']
 | 
					            awsbucket = config['awsbucket']
 | 
				
			||||||
            index_only = config.get('awsbucket_index_only')
 | 
					            index_only = config.get('awsbucket_index_only')
 | 
				
			||||||
            update_remote_storage_with_rclone(
 | 
					            update_remote_storage_with_rclone(
 | 
				
			||||||
                repo_section, awsbucket, index_only, options.verbose, options.quiet
 | 
					                repo_section,
 | 
				
			||||||
 | 
					                awsbucket,
 | 
				
			||||||
 | 
					                index_only,
 | 
				
			||||||
 | 
					                options.verbose,
 | 
				
			||||||
 | 
					                options.quiet,
 | 
				
			||||||
 | 
					                not options.no_checksum,
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
        if config.get('androidobservatory'):
 | 
					        if config.get('androidobservatory'):
 | 
				
			||||||
            upload_to_android_observatory(repo_section)
 | 
					            upload_to_android_observatory(repo_section)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue