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 aaa4680..97f99a9 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -9,7 +9,7 @@ planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-11
 PingOfDeath-GITPATH            := git://git.onelab.eu/pingofdeath.git@PingOfDeath-2.2-1
 plnode-utils-GITPATH            := git://git.onelab.eu/plnode-utils.git@plnode-utils-0.2-2
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-5.2-16
 #
 pl_sshd-GITPATH                        := git://git.onelab.eu/pl_sshd.git@pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@codemux-0.1-15

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 623f6f1..9f4ad6e 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -17,7 +17,7 @@ util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-11
 PingOfDeath-GITPATH            := git://git.onelab.eu/pingofdeath.git@PingOfDeath-2.2-1
 plnode-utils-GITPATH            := git://git.onelab.eu/plnode-utils.git@plnode-utils-0.2-2
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-5.2-16
 pl_sshd-GITPATH                        := git://git.onelab.eu/pl_sshd.git@pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@codemux-0.1-15
 fprobe-ulog-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-3