jhbuild r1921 - in trunk: . jhbuild/versioncontrol

[malureau svn gnome org]

Author: malureau
Date: Sun Mar  9 22:21:37 2008
New Revision: 1921
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1921&view=rev

Log:
2008-03-10  Marc-Andre Lureau  <marcandre lureau gmail com>

* jhbuild/versioncontrol/git.py: fix svn:externals with git-svn,
altough it might need rewrite with 'submodule' support when
git-svn show-externals will be working on GNOME repositories.


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	Sun Mar  9 22:21:37 2008
@@ -218,10 +218,13 @@
 
     def _get_externals(self, buildscript):
         subdirs = jhbuild.versioncontrol.svn.get_subdirs (self.module)
+        subdirs.append ('/')
         for subdir in subdirs:
+            print 'checking', subdir, '...'
             externals = jhbuild.versioncontrol.svn.get_externals (self.module + '/' + subdir)
             for external in externals:
-                extdir = os.path.join (self.get_checkoutdir(), subdir, external)
+                extdir = self.get_checkoutdir() + os.sep + subdir + os.sep + external
+                # fixme: the "right way" is to use submodules
                 extbranch = GitSvnBranch(self.repository, externals[external], extdir)
                 try:
                     os.stat(extdir)[stat.ST_MODE]
@@ -255,7 +258,7 @@
             pass
 
         #fixme, git-svn should support externals
-        # self._get_externals(buildscript, cwd)
+        self._get_externals(buildscript)
 
     def _update(self, buildscript, copydir=None):
         if self.config.sticky_date:
@@ -281,7 +284,7 @@
             pass
 
         #fixme, git-svn should support externals
-        # self._get_externals(buildscript)
+        self._get_externals(buildscript)
 
 class GitCvsBranch(GitBranch):
     def __init__(self, repository, module, checkoutdir, revision=None):