From 39be44f16d1a817c10a268808fdcaed6628db261 Mon Sep 17 00:00:00 2001
From: Michael Schwarz <michi.schwarz@gmail.com>
Date: Wed, 30 Sep 2015 18:12:10 +0200
Subject: Include input file path in error messages.

---
 support/asymptote/__main__.py | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'support/asymptote/__main__.py')

diff --git a/support/asymptote/__main__.py b/support/asymptote/__main__.py
index 9d712ef..705649a 100644
--- a/support/asymptote/__main__.py
+++ b/support/asymptote/__main__.py
@@ -34,21 +34,24 @@ def _asymptote(in_path, out_path, asymptote_dir, working_dir):
 
 @util.main
 def main(in_path, out_path):
-	_, out_suffix = os.path.splitext(out_path)
-	
-	with util.TemporaryDirectory() as temp_dir:
-		absolute_in_path = os.path.abspath(in_path)
-		temp_out_path = os.path.join(temp_dir, 'out.pdf')
-		
-		# Asymptote creates A LOT of temp files (presumably when invoking LaTeX) and leaves some of them behind. Thus we run asymptote in a temporary directory.
-		loaded_files = _asymptote(absolute_in_path, 'out', os.path.dirname(absolute_in_path), temp_dir)
-		
-		if not os.path.exists(temp_out_path):
-			raise util.UserError('Asymptote did not generate a PDF file for input file {}.', in_path)
-		
-		# All dependencies as paths relative to the project root.
-		dependencies = set(map(os.path.relpath, loaded_files))
+	try:
+		_, out_suffix = os.path.splitext(out_path)
 		
-		# Write output files.
-		make.write_dependencies(out_path + '.d', out_path, dependencies - { in_path })
-		shutil.copyfile(temp_out_path, out_path)
+		with util.TemporaryDirectory() as temp_dir:
+			absolute_in_path = os.path.abspath(in_path)
+			temp_out_path = os.path.join(temp_dir, 'out.pdf')
+			
+			# Asymptote creates A LOT of temp files (presumably when invoking LaTeX) and leaves some of them behind. Thus we run asymptote in a temporary directory.
+			loaded_files = _asymptote(absolute_in_path, 'out', os.path.dirname(absolute_in_path), temp_dir)
+			
+			if not os.path.exists(temp_out_path):
+				raise util.UserError('Asymptote did not generate a PDF file.', in_path)
+			
+			# All dependencies as paths relative to the project root.
+			dependencies = set(map(os.path.relpath, loaded_files))
+			
+			# Write output files.
+			make.write_dependencies(out_path + '.d', out_path, dependencies - { in_path })
+			shutil.copyfile(temp_out_path, out_path)
+	except util.UserError as e:
+		raise util.UserError('While processing {}: {}', in_path, e)
-- 
cgit