diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-01-20 12:09:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-01-20 12:09:31 +0000 |
| commit | 079e6825aacec7ef9b3976c9057363b690a43ce5 (patch) | |
| tree | b25054c486e11d0b293e2166f1c4cdce02eb8704 /bitbake/lib/bb/fetch | |
| parent | 027c071fc5fbaed003d17e1d385008a5b70ee3eb (diff) | |
| download | openembedded-core-079e6825aacec7ef9b3976c9057363b690a43ce5.tar.gz openembedded-core-079e6825aacec7ef9b3976c9057363b690a43ce5.tar.bz2 openembedded-core-079e6825aacec7ef9b3976c9057363b690a43ce5.tar.xz openembedded-core-079e6825aacec7ef9b3976c9057363b690a43ce5.zip | |
bitbake: sync with upstream stable branch bugfixes and enhancements
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3554 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/fetch')
| -rw-r--r-- | bitbake/lib/bb/fetch/git.py | 5 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/wget.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 21259a23b..9cc7f4e08 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py @@ -50,6 +50,8 @@ class Git(Fetch): if 'protocol' in ud.parm: ud.proto = ud.parm['protocol'] + ud.branch = ud.parm.get("branch", "") + tag = Fetch.srcrev_internal_helper(ud, d) if tag is True: ud.tag = self.latest_revision(url, ud, d) @@ -130,7 +132,8 @@ class Git(Fetch): def _latest_revision(self, url, ud, d): - output = runfetchcmd("git ls-remote %s://%s%s" % (ud.proto, ud.host, ud.path), d, True) + bb.msg.note(1, bb.msg.domain.Fetcher, "Calling git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch ) ) + output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True) return output.split()[0] def _build_revision(self, url, ud, d): diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py index 2d590ad0b..f8ade45da 100644 --- a/bitbake/lib/bb/fetch/wget.py +++ b/bitbake/lib/bb/fetch/wget.py @@ -66,10 +66,10 @@ class Wget(Fetch): if ret != 0: return False - # check if sourceforge did send us to the mirror page + # Sanity check since wget can pretend it succeed when it didn't + # Also, this used to happen if sourceforge sent us to the mirror page if not os.path.exists(ud.localpath): - os.system("rm %s*" % ud.localpath) # FIXME shell quote it - bb.msg.debug(2, bb.msg.domain.Fetcher, "sourceforge.net send us to the mirror on %s" % ud.basename) + bb.msg.debug(2, bb.msg.domain.Fetcher, "The fetch command for %s returned success but %s doesn't exist?..." % (uri, ud.localpath)) return False return True |