diff options
| author | Richard Purdie <richard@ted.(none)> | 2009-04-28 08:24:11 +0100 |
|---|---|---|
| committer | Richard Purdie <richard@ted.(none)> | 2009-04-28 08:24:11 +0100 |
| commit | 3927e38eba96a172c7df2c7270c31728b83612eb (patch) | |
| tree | 48b0a30d721af9e2f25e03bea8e41035e9ff40bb /bitbake/lib/bb/fetch | |
| parent | 49ca46f588425c88e37a85df00b1fd4591a01ab6 (diff) | |
| parent | d65be3dd2aaa643b5596c8470caf7f291513efee (diff) | |
| download | openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.gz openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.bz2 openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.xz openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.zip | |
Merge ssh://gitserver@git.pokylinux.org/poky
Diffstat (limited to 'bitbake/lib/bb/fetch')
| -rw-r--r-- | bitbake/lib/bb/fetch/hg.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch/hg.py b/bitbake/lib/bb/fetch/hg.py index b87fd0fbe..7643e159e 100644 --- a/bitbake/lib/bb/fetch/hg.py +++ b/bitbake/lib/bb/fetch/hg.py @@ -123,9 +123,6 @@ class Hg(Fetch): bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd) runfetchcmd(updatecmd, d) - updatecmd = self._buildhgcommand(ud, d, "update") - bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd) - runfetchcmd(updatecmd, d) else: fetchcmd = self._buildhgcommand(ud, d, "fetch") bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc) @@ -134,6 +131,12 @@ class Hg(Fetch): os.chdir(ud.pkgdir) bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % fetchcmd) runfetchcmd(fetchcmd, d) + + # Even when we clone (fetch), we still need to update as hg's clone + # won't checkout the specified revision if its on a branch + updatecmd = self._buildhgcommand(ud, d, "update") + bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd) + runfetchcmd(updatecmd, d) os.chdir(ud.pkgdir) try: |