Fix git fetcher subpath option v2

This patch makes the git fetcher (fetch2) subpath option work the way the Opie git recipes (the main user of the option) expect.

Since v1, handle subpath with depth > 1 correctly.

The patch (against poky, but applies cleanly to bitbake master with
-p2) is available at:
git://git.pokylinux.org/poky-contrib paule/subpath
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/subpath

Paul Eggleton (1):
fetch2/git: fix subpath destination directory

 bitbake/lib/bb/fetch2/git.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

1.7.4.1

Make the git fetcher's subpath (path within the git repo to fetch) option set the destsuffix (destination directory) option by default. This reverts the behaviour of subpath to the same as when it was introduced.

Based on a patch by Dmitry Eremin-Solenikov <[email protected]>

---
 bitbake/lib/bb/fetch2/git.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

index 9a578ae..229dcd6 100644
@@ -210,10 +210,12 @@ class Git(FetchMethod):
         subdir = ud.parm.get("subpath", "")
         if subdir != "":
             readpathspec = ":%s" % (subdir)
+            def_destsuffix = "%s/" % os.path.basename(subdir)
         else:
             readpathspec = ""
+            def_destsuffix = "git/"
 
-        destsuffix = ud.parm.get("destsuffix", "git/")
+        destsuffix = ud.parm.get("destsuffix", def_destsuffix)
         destdir = os.path.join(destdir, destsuffix)
         if os.path.exists(destdir):
             bb.utils.prunedir(destdir)

1.7.4.1

Merged to master, thanks.

Richard