summaryrefslogtreecommitdiffstats
path: root/bitbake-dev/lib/bb/fetch/hg.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake-dev/lib/bb/fetch/hg.py')
-rw-r--r--bitbake-dev/lib/bb/fetch/hg.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/bitbake-dev/lib/bb/fetch/hg.py b/bitbake-dev/lib/bb/fetch/hg.py
index b87fd0fbe5..f53be8b20b 100644
--- a/bitbake-dev/lib/bb/fetch/hg.py
+++ b/bitbake-dev/lib/bb/fetch/hg.py
@@ -24,7 +24,7 @@ BitBake 'Fetch' implementation for mercurial DRCS (hg).
24# 24#
25# Based on functions from the base bb module, Copyright 2003 Holger Schurig 25# Based on functions from the base bb module, Copyright 2003 Holger Schurig
26 26
27import os, re 27import os
28import sys 28import sys
29import bb 29import bb
30from bb import data 30from bb import data
@@ -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: