From 38590966815ea096427f9a92479988ddfac02aa1 Mon Sep 17 00:00:00 2001
From: Matteo Bertini <matteo@naufraghi.net>
Date: Mon, 16 Mar 2015 17:19:21 +0100
Subject: [PATCH] Propagate SyntaxError message in exec-ing .xonshrc to the
 user

---
 xonsh/environ.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xonsh/environ.py b/xonsh/environ.py
index 86cfb475c..658aa9f30 100644
--- a/xonsh/environ.py
+++ b/xonsh/environ.py
@@ -138,8 +138,8 @@ def xonshrc_context(rcfile=None, execer=None):
     try:
         execer.filename = rcfile
         execer.exec(rc, glbs={}, locs=env)
-    except SyntaxError:
-        warn('syntax error in xonsh run control file {0!r}'.format(rcfile), 
+    except SyntaxError as err:
+        warn('syntax error in xonsh run control file {0!r}: {1!s}'.format(rcfile, err), 
              RuntimeWarning)
     finally:
         execer.filename = fname