[jhbuild] Correct 'failed to parse' blaming wrong file (GNOME bug 663003)

[Craig Keogh <cskeogh src gnome org>]

commit f395a5a835f1816eed62afeb6aee929850eb3565
Author: Craig Keogh <cskeogh adam com au>
Date:   Sat Nov 19 19:51:25 2011 +1030

    Correct 'failed to parse' blaming wrong file (GNOME bug 663003)

 jhbuild/moduleset.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index fd83b0e..0dd8d7d 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -360,10 +360,7 @@ def load(config, uri=None):
         elif not urlparse.urlparse(uri)[0]:
             uri = 'http://git.gnome.org/browse/jhbuild/plain/modulesets' \
                   '/%s.modules' % uri
-        try:
-            ms.modules.update(_parse_module_set(config, uri).modules)
-        except xml.parsers.expat.ExpatError, e:
-            raise FatalError(_('failed to parse %s: %s') % (uri, e))
+        ms.modules.update(_parse_module_set(config, uri).modules)
     return ms
 
 def load_tests (config, uri=None):
@@ -394,6 +391,8 @@ def _parse_module_set(config, uri):
         document = xml.dom.minidom.parse(filename)
     except IOError, e:
         raise FatalError(_('failed to parse %s: %s') % (filename, e))
+    except xml.parsers.expat.ExpatError, e:
+        raise FatalError(_('failed to parse %s: %s') % (uri, e))
 
     assert document.documentElement.nodeName == 'moduleset'
     moduleset = ModuleSet(config = config)