Merge branch 'dev'
This commit is contained in:
		
							
								
								
									
										15
									
								
								mikes-backup
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								mikes-backup
									
									
									
									
									
								
							@@ -376,12 +376,15 @@ class MikesBackup:
 | 
				
			|||||||
		
 | 
							
 | 
				
			||||||
		self.log("Rsync seems to have finished successfully")
 | 
							self.log("Rsync seems to have finished successfully")
 | 
				
			||||||
		self.log("Because a full backup has succeeded, will now delete any differential backups")
 | 
							self.log("Because a full backup has succeeded, will now delete any differential backups")
 | 
				
			||||||
		self.execute_remote_ssh_command(
 | 
							args_remove_differentials = [
 | 
				
			||||||
			[
 | 
								"rm",
 | 
				
			||||||
				"rm",
 | 
								"-rfv",
 | 
				
			||||||
				"-rfv",
 | 
								self.make_remote_differential_backup_path_base()
 | 
				
			||||||
				self.make_remote_differential_backup_path_base()
 | 
							]
 | 
				
			||||||
			])
 | 
							if self.is_using_ssh():
 | 
				
			||||||
 | 
								self.execute_remote_ssh_command(args_remove_differentials)
 | 
				
			||||||
 | 
							else:
 | 
				
			||||||
 | 
								self.execute_command(args_remove_differentials)
 | 
				
			||||||
		self.log("Finished deleting old differentials")
 | 
							self.log("Finished deleting old differentials")
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	#
 | 
						#
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user