Projet

Général

Profil

0001-export_to_pdf-make-temp-variable-known-regardless-of.patch

Paul Marillonnet, 29 juillet 2020 15:30

Télécharger (1,11 ko)

Voir les différences: 

Subject: [PATCH] export_to_pdf: make temp variable known regardless of raised
 exceptions (#45565)


 wcs/wf/export_to_model.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
wcs/wf/export_to_model.py
69 69 
    subprocess.check_call(['which', 'libreoffice'], stdout=subprocess.DEVNULL)
70 70 

  		




  71
  71
  
    
    def transform_to_pdf(instream):

  		




  
  72
  
    
        temp_dir = None

  		




  72
  73
  
    
        try:

  		




  73
  74
  
    
            temp_dir = tempfile.mkdtemp()

  		




  74
  75
  
    
            with tempfile.NamedTemporaryFile(dir=temp_dir) as infile:

  		




  ......




  96
  97
  
    
        except subprocess.CalledProcessError:

  		




  97
  98
  
    
            raise Exception('libreoffice is failing')

  		




  98
  99
  
    
        finally:

  		




  99
  
  
    
            shutil.rmtree(temp_dir)

  		




  
  100
  
    
            if temp_dir:

  		




  
  101
  
    
                shutil.rmtree(temp_dir)

  		




  100
  102
  
    
except subprocess.CalledProcessError:

  		




  101
  103
  
    
    transform_to_pdf = None

  		




  102
  104
  
    

  		




  103
  
  
    
-