jhbuild r2061 - in trunk: . jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Thu May  1 13:52:11 2008
New Revision: 2061
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2061&view=rev

Log:
* jhbuild/versioncontrol/arch.py, jhbuild/versioncontrol/bzr.py,
jhbuild/versioncontrol/darcs.py, jhbuild/versioncontrol/git.py,
jhbuild/versioncontrol/hg.py, jhbuild/versioncontrol/mtn.py,
jhbuild/versioncontrol/tarball.py: aborts with an useful message when a
branch is incorrectly overrided in .jhbuildrc.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/arch.py
   trunk/jhbuild/versioncontrol/bzr.py
   trunk/jhbuild/versioncontrol/darcs.py
   trunk/jhbuild/versioncontrol/git.py
   trunk/jhbuild/versioncontrol/hg.py
   trunk/jhbuild/versioncontrol/mtn.py
   trunk/jhbuild/versioncontrol/tarball.py

Modified: trunk/jhbuild/versioncontrol/arch.py
==============================================================================
--- trunk/jhbuild/versioncontrol/arch.py	(original)
+++ trunk/jhbuild/versioncontrol/arch.py	Thu May  1 13:52:11 2008
@@ -87,6 +87,8 @@
     def branch(self, name, module=None, checkoutdir=None):
         if name in self.config.branches:
             module = self.config.branches[name]
+            if not module:
+                raise FatalError('branch for %s has wrong override, check your .jhbuildrc' % name)
         else:
             if module is None:
                 module = name

Modified: trunk/jhbuild/versioncontrol/bzr.py
==============================================================================
--- trunk/jhbuild/versioncontrol/bzr.py	(original)
+++ trunk/jhbuild/versioncontrol/bzr.py	Thu May  1 13:52:11 2008
@@ -57,6 +57,8 @@
     def branch(self, name, module=None, checkoutdir=None):
         if name in self.config.branches:
             module = self.config.branches[name]
+            if not module:
+                raise FatalError('branch for %s has wrong override, check your .jhbuildrc' % name)
         else:
             if module is None:
                 module = name

Modified: trunk/jhbuild/versioncontrol/darcs.py
==============================================================================
--- trunk/jhbuild/versioncontrol/darcs.py	(original)
+++ trunk/jhbuild/versioncontrol/darcs.py	Thu May  1 13:52:11 2008
@@ -47,6 +47,8 @@
     def branch(self, name, module=None, checkoutdir=None):
         if name in self.config.branches:
             module = self.config.branches[name]
+            if not module:
+                raise FatalError('branch for %s has wrong override, check your .jhbuildrc' % name)
         else:
             if module is None:
                 module = name

Modified: trunk/jhbuild/versioncontrol/git.py
==============================================================================
--- trunk/jhbuild/versioncontrol/git.py	(original)
+++ trunk/jhbuild/versioncontrol/git.py	Thu May  1 13:52:11 2008
@@ -69,6 +69,8 @@
                revision = None, tag = None):
         if name in self.config.branches:
             module = self.config.branches[name]
+            if not module:
+                raise FatalError('branch for %s has wrong override, check your .jhbuildrc' % name)
         else:
             if module is None:
                 module = name

Modified: trunk/jhbuild/versioncontrol/hg.py
==============================================================================
--- trunk/jhbuild/versioncontrol/hg.py	(original)
+++ trunk/jhbuild/versioncontrol/hg.py	Thu May  1 13:52:11 2008
@@ -48,6 +48,8 @@
     def branch(self, name, module=None, checkoutdir=None):
         if name in self.config.branches:
             module = self.config.branches[name]
+            if not module:
+                raise FatalError('branch for %s has wrong override, check your .jhbuildrc' % name)
         else:
             if module is None:
                 module = name

Modified: trunk/jhbuild/versioncontrol/mtn.py
==============================================================================
--- trunk/jhbuild/versioncontrol/mtn.py	(original)
+++ trunk/jhbuild/versioncontrol/mtn.py	Thu May  1 13:52:11 2008
@@ -47,6 +47,8 @@
     def branch(self, name, branch=None, module=None, checkoutdir=None):
         if name in self.config.branches:
             module = self.config.branches[module]
+            if not module:
+                raise FatalError('branch for %s has wrong override, check your .jhbuildrc' % name)
 
         if not branch:
             branch = self.defbranch

Modified: trunk/jhbuild/versioncontrol/tarball.py
==============================================================================
--- trunk/jhbuild/versioncontrol/tarball.py	(original)
+++ trunk/jhbuild/versioncontrol/tarball.py	Thu May  1 13:52:11 2008
@@ -59,6 +59,8 @@
                size=None, md5sum=None, branch_id=None):
         if name in self.config.branches:
             module = self.config.branches[name]
+            if not module:
+                raise FatalError('branch for %s has wrong override, check your .jhbuildrc' % name)
         else:
             if module is None:
                 module = name