mirror of
				https://github.com/mail-in-a-box/mailinabox.git
				synced 2025-10-30 18:50:53 +00:00 
			
		
		
		
	additional error handling for backups with an invalid target
This commit is contained in:
		
							parent
							
								
									bded529535
								
							
						
					
					
						commit
						848dea83ab
					
				| @ -53,7 +53,7 @@ def backup_status(env): | |||||||
| 			"size": 0, # collection-status doesn't give us the size | 			"size": 0, # collection-status doesn't give us the size | ||||||
| 			"volumes": keys[2], # number of archive volumes for this backup (not really helpful) | 			"volumes": keys[2], # number of archive volumes for this backup (not really helpful) | ||||||
| 		} | 		} | ||||||
| 	collection_status = shell('check_output', [ | 	code, collection_status = shell('check_output', [ | ||||||
| 		"/usr/bin/duplicity", | 		"/usr/bin/duplicity", | ||||||
| 		"collection-status", | 		"collection-status", | ||||||
| 		"--archive-dir", backup_cache_dir, | 		"--archive-dir", backup_cache_dir, | ||||||
| @ -61,7 +61,12 @@ def backup_status(env): | |||||||
| 		"--log-fd", "1", | 		"--log-fd", "1", | ||||||
| 		config["target"], | 		config["target"], | ||||||
| 		], | 		], | ||||||
| 		get_env(env)) | 		get_env(env), | ||||||
|  | 		trap=True) | ||||||
|  | 	if code != 0: | ||||||
|  | 		# Command failed. This is likely due to an improperly configured remote | ||||||
|  | 		# destination for the backups. | ||||||
|  | 		return { } | ||||||
| 	for line in collection_status.split('\n'): | 	for line in collection_status.split('\n'): | ||||||
| 		if line.startswith(" full") or line.startswith(" inc"): | 		if line.startswith(" full") or line.startswith(" inc"): | ||||||
| 			backup = parse_line(line) | 			backup = parse_line(line) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user