Added logger debug message when file not found when deleting
This commit is contained in:
		
					parent
					
						
							
								2983940d0f
							
						
					
				
			
			
				commit
				
					
						511a1551d5
					
				
			
		
					 2 changed files with 9 additions and 5 deletions
				
			
		| 
						 | 
					@ -108,8 +108,10 @@ class UserHostingKeyForm(forms.ModelForm):
 | 
				
			||||||
                raise forms.ValidationError(KEY_ERROR_MESSAGE)
 | 
					                raise forms.ValidationError(KEY_ERROR_MESSAGE)
 | 
				
			||||||
            try:
 | 
					            try:
 | 
				
			||||||
                os.remove(tmp_public_key_file.name)
 | 
					                os.remove(tmp_public_key_file.name)
 | 
				
			||||||
            except OSError:
 | 
					            except FileNotFoundError:
 | 
				
			||||||
                pass
 | 
					                logger.debug(
 | 
				
			||||||
 | 
					                    "{} could not be deleted because it doesn't exist".format(
 | 
				
			||||||
 | 
					                        tmp_public_key_file.name))
 | 
				
			||||||
        return openssh_pubkey_str
 | 
					        return openssh_pubkey_str
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def clean_name(self):
 | 
					    def clean_name(self):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
import tempfile
 | 
					 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
 | 
					import tempfile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import cdist
 | 
					import cdist
 | 
				
			||||||
from cdist.integration import configure_hosts_simple
 | 
					from cdist.integration import configure_hosts_simple
 | 
				
			||||||
| 
						 | 
					@ -70,8 +70,10 @@ def save_ssh_key(self, hosts, keys):
 | 
				
			||||||
            return_value = False
 | 
					            return_value = False
 | 
				
			||||||
    try:
 | 
					    try:
 | 
				
			||||||
        os.remove(tmp_manifest.name)
 | 
					        os.remove(tmp_manifest.name)
 | 
				
			||||||
    except OSError:
 | 
					    except FileNotFoundError:
 | 
				
			||||||
        pass
 | 
					        logger.debug(
 | 
				
			||||||
 | 
					            "{} could not be deleted because it doesn't exist".format(
 | 
				
			||||||
 | 
					                tmp_manifest.name))
 | 
				
			||||||
    return return_value
 | 
					    return return_value
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue