module-tools & git clone : specify --depth only when necessary

Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --git a/lxc-tags.mk b/lxc-tags.mk
index f5dc0ab..97f99a9 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -1,9 +1,9 @@
 lxc-userspace-GITPATH           := git://git.onelab.eu/lxc-userspace.git@lxc-userspace-1.0-12
 transforward-GITPATH            := git://git.onelab.eu/transforward.git@transforward-0.1-9
 procprotect-GITPATH             := git://git.onelab.eu/procprotect.git@procprotect-0.4-7
-ipfw-GITPATH                    := https://code.google.com/p/dummynet@e717cdd4bef764a4aa7babedc54220b35b04c777
-# this was known to work with f18 but not f20
-#ipfw-GITPATH                    := git://git.code.sf.net/p/dummynet/code@155b6cd31089b4763297d579e9c9945393f00c40
+# ipfw-sourceforge.git (obsolete) mirrored on git.onelab.eu from git://git.code.sf.net/p/dummynet/code
+# ipfw-google.git (current) is mirrored on git.onelab.eu from https://code.google.com/p/dummynet
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw-google.git@e717cdd4bef764a4aa7babedc54220b35b04c777
 comgt-GITPATH                  := git://git.onelab.eu/comgt.git@0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-11

diff --git a/module-tools.py b/module-tools.py
index 58f7b85..aed29e3 100755 (executable)
--- a/module-tools.py
+++ b/module-tools.py
@@ -280,9 +280,10 @@ class GitRepository:
                 return line.split()[2]
 
     @classmethod
-    def clone(cls, remote, local, options, depth=0):
+    def clone(cls, remote, local, options, depth=None):
         Command("rm -rf %s" % local, options).run_silent()
-        Command("git clone --depth %d %s %s" % (depth, remote, local), options).run_fatal()
+        depth_option = "" if depth is None else " --depth {}".format(depth)
+        Command("git clone{} {} {}".format(depth_option, remote, local), options).run_fatal()
         return GitRepository(local, options)
 
     @classmethod

diff --git a/onelab-tags.mk b/onelab-tags.mk
index bd0539c..9f4ad6e 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -1,8 +1,11 @@
 ###
 linux-2.6-BRANCH               := 32
 linux-2.6-GITPATH               := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-36
+# ipfw-sourceforge.git (obsolete) mirrored on git.onelab.eu from git://git.code.sf.net/p/dummynet/code
+# ipfw-GITPATH                 := git://git.onelab.eu/ipfw-sourceforge.git@ipfw-20130423-1
+# ipfw-google.git (current) is mirrored on git.onelab.eu from https://code.google.com/p/dummynet
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw-google.git@e717cdd4bef764a4aa7babedc54220b35b04c777
 
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw-sourceforge.git@ipfw-20130423-1
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-6
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
 ###