diff options
| -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 b87fd0fbe5..7643e159ec 100644 --- a/bitbake/lib/bb/fetch/hg.py +++ b/bitbake/lib/bb/fetch/hg.py | |||
| @@ -123,9 +123,6 @@ class Hg(Fetch): | |||
| 123 | bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd) | 123 | bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd) |
| 124 | runfetchcmd(updatecmd, d) | 124 | runfetchcmd(updatecmd, d) |
| 125 | 125 | ||
| 126 | updatecmd = self._buildhgcommand(ud, d, "update") | ||
| 127 | bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd) | ||
| 128 | runfetchcmd(updatecmd, d) | ||
| 129 | else: | 126 | else: |
| 130 | fetchcmd = self._buildhgcommand(ud, d, "fetch") | 127 | fetchcmd = self._buildhgcommand(ud, d, "fetch") |
| 131 | bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc) | 128 | bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc) |
| @@ -134,6 +131,12 @@ class Hg(Fetch): | |||
| 134 | os.chdir(ud.pkgdir) | 131 | os.chdir(ud.pkgdir) |
| 135 | bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % fetchcmd) | 132 | bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % fetchcmd) |
| 136 | runfetchcmd(fetchcmd, d) | 133 | runfetchcmd(fetchcmd, d) |
| 134 | |||
| 135 | # Even when we clone (fetch), we still need to update as hg's clone | ||
| 136 | # won't checkout the specified revision if its on a branch | ||
| 137 | updatecmd = self._buildhgcommand(ud, d, "update") | ||
| 138 | bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd) | ||
| 139 | runfetchcmd(updatecmd, d) | ||
| 137 | 140 | ||
| 138 | os.chdir(ud.pkgdir) | 141 | os.chdir(ud.pkgdir) |
| 139 | try: | 142 | try: |
