Patchwork [bitbake-devel,1/1] hg.py: Fixed fetch failure that occurs when SRCREV is a tag.

login
mail settings
Submitter Jon Szymaniak
Date Dec. 17, 2012, 2:22 p.m.
Message ID <50CF2ABB.2000002@gmail.com>
Download mbox | patch
Permalink /patch/41203/
State New
Headers show

Comments

Jon Szymaniak - Dec. 17, 2012, 2:22 p.m.
Removed "-r REV" from hg clone invocation to fetch the entire repo,
rather than just the subset at the specified revision. This will ensure
that the specified tag exists for successive commands (e.g., the update
built on line 149.)

Signed-off-by: Jon Szymaniak <jon.szymaniak@gmail.com>
---
  lib/bb/fetch2/hg.py |    7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/lib/bb/fetch2/hg.py b/lib/bb/fetch2/hg.py
index 155ae67..be0ef3b 100644
--- a/lib/bb/fetch2/hg.py
+++ b/lib/bb/fetch2/hg.py
@@ -98,7 +98,12 @@  class Hg(FetchMethod):
              return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module)

          options = [];
-        if ud.revision:
+
+        # Don't specify revision for the fetch; clone the entire repo.
+        # This avoids an issue if the specified revision is a tag, because
+        # the tag actually exists in the specified revision + 1, so it won't
+        # be available when used in any successive commands.
+        if ud.revision and command != "fetch":
              options.append("-r %s" % ud.revision)

          if command == "fetch":