diff options
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 ee3bd2f7f..1cd5a8aa5 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: |