jhbuild r2034 - in trunk: . jhbuild/versioncontrol



Author: malureau
Date: Sat Apr 19 10:42:50 2008
New Revision: 2034
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2034&view=rev

Log:
2008-04-19  Marc-Andre Lureau  <marcandre lureau gmail com>

	* jhbuild/versioncontrol/git.py (GitSvnBranch._checkout): Raise a
	proper error message when the location is incorrect.


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

Modified: trunk/jhbuild/versioncontrol/git.py
==============================================================================
--- trunk/jhbuild/versioncontrol/git.py	(original)
+++ trunk/jhbuild/versioncontrol/git.py	Sat Apr 19 10:42:50 2008
@@ -257,9 +257,12 @@
             cmd.append(self.checkoutdir)
 
         #fixme (add self.revision support)
-        last_revision = jhbuild.versioncontrol.svn.get_info (self.module)['last changed rev']
-        if not self.revision:
-            cmd.extend(['-r', last_revision])
+        try:
+            last_revision = jhbuild.versioncontrol.svn.get_info (self.module)['last changed rev']
+            if not self.revision:
+                cmd.extend(['-r', last_revision])
+        except KeyError:
+            raise FatalError('Cannot get last revision from ' + self.module + '. Check the module location.')
 
         if copydir:
             buildscript.execute(cmd, 'git-svn', cwd=copydir)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]