diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-08-27 14:06:18 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-09-01 11:14:41 +0100 |
commit | 5c229f921fbd6f1ffae4038c05bf32f9b4051684 (patch) | |
tree | 47ca42c4cab5b734f877d3a37dac9959f20e3298 /bitbake/lib | |
parent | b54e95fd069217a192d9bb8a3c261e33600e2538 (diff) | |
download | poky-5c229f921fbd6f1ffae4038c05bf32f9b4051684.tar.gz |
bitbake/git: define a forcefetch method
The git fetcher should force a fetch if the required tag is not present in
the local clone, or if the fullclone parameter is set.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/fetch/git.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 9cd538854f..b6126cbe91 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py | |||
@@ -85,6 +85,11 @@ class Git(Fetch): | |||
85 | 85 | ||
86 | return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) | 86 | return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) |
87 | 87 | ||
88 | def forcefetch(self, url, ud, d): | ||
89 | if not self._contains_ref(ud.tag, d) or 'fullclone' in ud.parm: | ||
90 | return True | ||
91 | return False | ||
92 | |||
88 | def go(self, loc, ud, d): | 93 | def go(self, loc, ud, d): |
89 | """Fetch url""" | 94 | """Fetch url""" |
90 | 95 | ||
@@ -108,8 +113,8 @@ class Git(Fetch): | |||
108 | runfetchcmd("%s clone -n %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.clonedir), d) | 113 | runfetchcmd("%s clone -n %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.clonedir), d) |
109 | 114 | ||
110 | os.chdir(ud.clonedir) | 115 | os.chdir(ud.clonedir) |
111 | # Remove all but the .git directory | ||
112 | if not self._contains_ref(ud.tag, d) or 'fullclone' in ud.parm: | 116 | if not self._contains_ref(ud.tag, d) or 'fullclone' in ud.parm: |
117 | # Remove all but the .git directory | ||
113 | runfetchcmd("rm * -Rf", d) | 118 | runfetchcmd("rm * -Rf", d) |
114 | runfetchcmd("%s fetch %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.branch), d) | 119 | runfetchcmd("%s fetch %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.branch), d) |
115 | runfetchcmd("%s fetch --tags %s://%s%s%s" % (ud.basecmd, ud.proto, username, ud.host, ud.path), d) | 120 | runfetchcmd("%s fetch --tags %s://%s%s%s" % (ud.basecmd, ud.proto, username, ud.host, ud.path), d) |