]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
git fetcher: make tag back to work, fix Yocto bug 972
authorYu Ke <ke.yu@intel.com>
Mon, 18 Apr 2011 05:53:53 +0000 (13:53 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 6 May 2011 14:32:23 +0000 (15:32 +0100)
In current git fetcher, tag does not work due to commit http://git.pokylinux.org/cgit/cgit.cgi/poky/commit/?id=5920e85c561624e657c126df58f5c378a8950bbc. Tag is not in sha256 form, so it will be treated invalid, and silently replaced by latest revision.

To fix it, this patch treat tag name as branches name, thus it will be handled correctly later. Thanks Richard for reviewing and proposing the better approach.

Fix [YOCTO #972]

CC: Richard Purdie <richard.purdie@linuxfoundation.org>
(From Poky rev: a2030c8d1a58c79428cba80158982aea4d2d9f6d)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/fetch2/git.py

index 1679f81511354f92f3efce08606931bbf99b3be9..b5bcfcf0a50711e3099cc04a14edebce08de6c43 100644 (file)
@@ -75,6 +75,7 @@ class Git(FetchMethod):
         for name in ud.names:
             # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one
             if not ud.revisions[name] or len(ud.revisions[name]) != 40  or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]):
+                ud.branches[name] = ud.revisions[name]
                 ud.revisions[name] = self.latest_revision(ud.url, ud, d, name)
 
         ud.write_tarballs = (data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0"