diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-09-07 10:47:54 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-09-07 10:47:54 +0000 |
| commit | e1af8defd6fce62a339e75c6cea11491ffc43b6c (patch) | |
| tree | e8298cf91e2df23505071789b043d597376a4bea | |
| parent | 4be407b4d92411c2963f31120d9b96a0231faf59 (diff) | |
| download | openembedded-core-e1af8defd6fce62a339e75c6cea11491ffc43b6c.tar.gz openembedded-core-e1af8defd6fce62a339e75c6cea11491ffc43b6c.tar.bz2 openembedded-core-e1af8defd6fce62a339e75c6cea11491ffc43b6c.zip | |
hg fetcher: Apply fixes from Matt Hoosier
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5153 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | bitbake/lib/bb/fetch/hg.py | 5 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch/hg.py b/bitbake/lib/bb/fetch/hg.py index ee3bd2f7fe..c7d2e62c13 100644 --- a/bitbake/lib/bb/fetch/hg.py +++ b/bitbake/lib/bb/fetch/hg.py @@ -79,7 +79,10 @@ class Hg(Fetch): host = "/" ud.host = "localhost" - hgroot = host + ud.path + if ud.user == None: + hgroot = host + ud.path + else: + hgroot = ud.user + "@" + host + ud.path if command is "info": return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d57ff4e7c8..0cdcb2e3c4 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -226,6 +226,7 @@ CVSDIR = "${CO_DIR}/cvs" SVNDIR = "${CO_DIR}/svn" GITDIR = "${CO_DIR}/git" BZRDIR = "${CO_DIR}/bzr" +HGDIR = "${CO_DIR}/hg" STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" @@ -471,6 +472,7 @@ FETCHCMD_svn = "/usr/bin/env svn" FETCHCMD_cvs = "/usr/bin/env cvs" FETCHCMD_wget = "/usr/bin/env wget -t 5" FETCHCMD_bzr = "/usr/bin/env bzr" +FETCHCMD_hg = "/usr/bin/env hg" FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" |