summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:42:47 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:42:47 +0100
commit5264d4b9e2506f10a8084c4df9429855e7a03405 (patch)
tree6711e7fa3485eb95d19006f8b58a19855592f0e9 /bitbake/lib/bb
parent5df6deaa32e4f6d0a8985403970a137270491991 (diff)
downloadpoky-5264d4b9e2506f10a8084c4df9429855e7a03405.tar.gz
bitbake: Fix a bug in the hg fetcher
Fix a bug in the hg fetcher where branch revisions are used with an initial checkout. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch/hg.py9
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: