jhbuild r2450 - in trunk: . jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Sat Nov  1 21:55:26 2008
New Revision: 2450
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2450&view=rev

Log:
* jhbuild/versioncontrol/tarball.py: added helpful message when a
tarball branch is not correct.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/tarball.py

Modified: trunk/jhbuild/versioncontrol/tarball.py
==============================================================================
--- trunk/jhbuild/versioncontrol/tarball.py	(original)
+++ trunk/jhbuild/versioncontrol/tarball.py	Sat Nov  1 21:55:26 2008
@@ -73,7 +73,10 @@
                              branch_id=branch_id)
 
     def branch_from_xml(self, name, branchnode, repositories, default_repo):
-        branch = Repository.branch_from_xml(self, name, branchnode, repositories, default_repo)
+        try:
+            branch = Repository.branch_from_xml(self, name, branchnode, repositories, default_repo)
+        except TypeError:
+            raise FatalError(_('branch for %s is not correct, check the moduleset file.') % name)
         # patches represented as children of the branch node
         for childnode in branchnode.childNodes:
             if childnode.nodeType != childnode.ELEMENT_NODE: continue