diff options
| author |   Joshua Lock <josh@openedhand.com> | 2008-09-30 16:54:37 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@openedhand.com> | 2008-09-30 16:54:37 +0000 |
| commit | cbaab65ff4bb3e4fc77066032a8858f4d5d61241 (patch) | |
| tree | 393dcbb8a980e4d8c0c9d9db4eb3405e9c7f5f90 /bitbake-dev/lib/bb/fetch/hg.py | |
| parent | d54280dd315810ad8cdbce5c52a1af3de902f6ef (diff) | |
| download | openembedded-core-contrib-cbaab65ff4bb3e4fc77066032a8858f4d5d61241.tar.gz | |
Merge changes from Poky bitbake 1.8
Update bitbake-dev to have extra fixes from Poky's internal (1.8) version of bitbake.
Should be able to use bitbake-dev with Poky now.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5340 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake-dev/lib/bb/fetch/hg.py')
| -rw-r--r-- | bitbake-dev/lib/bb/fetch/hg.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bitbake-dev/lib/bb/fetch/hg.py b/bitbake-dev/lib/bb/fetch/hg.py index ee3bd2f7fe..1cd5a8aa5c 100644 --- a/bitbake-dev/lib/bb/fetch/hg.py +++ b/bitbake-dev/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) @@ -91,7 +94,10 @@ class Hg(Fetch): if command is "fetch": cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module) elif command is "pull": - cmd = "%s pull %s" % (basecmd, " ".join(options)) + # do not pass options list; limiting pull to rev causes the local + # repo not to contain it and immediately following "update" command + # will crash + cmd = "%s pull" % (basecmd) elif command is "update": cmd = "%s update -C %s" % (basecmd, " ".join(options)) else: |