[PATCH] fetch2/gitsm: Unpack shallow mirror tarballs

[PATCH] fetch2/gitsm: Unpack shallow mirror tarballs

[Paul Barker]

When a shallow mirror tarball is used to satisfy a gitsm URI it needs to
be unpacked so that the .gitmodules file can be examined.

Signed-off-by: Paul Barker <pbarker@konsulko.com>
---
 lib/bb/fetch2/gitsm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py
index aa121cbe..98f5dae5 100644
--- a/lib/bb/fetch2/gitsm.py
+++ b/lib/bb/fetch2/gitsm.py
@@ -169,6 +169,12 @@ class GitSM(Git):
                 raise
 
         Git.download(self, ud, d)
+
+        # If we're using a shallow mirror tarball it needs to be unpacked so
+        # that we can examine the .gitmodules file
+        if ud.shallow and os.path.exists(ud.fullshallow) and Git.need_update(self, ud, d):
+            bb.utils.mkdirhier(ud.clonedir)
+            runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=ud.clonedir)
         self.process_submodules(ud, ud.clonedir, download_submodule, d)
 
     def unpack(self, ud, destdir, d):
-- 
2.20.1

Re: [PATCH] fetch2/gitsm: Unpack shallow mirror tarballs

[Paul Barker]

On Mon, 24 Feb 2020 at 20:14, Paul Barker <pbarker@konsulko.com> wrote:
>
> When a shallow mirror tarball is used to satisfy a gitsm URI it needs to
> be unpacked so that the .gitmodules file can be examined.
>
> Signed-off-by: Paul Barker <pbarker@konsulko.com>
> ---
>  lib/bb/fetch2/gitsm.py | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py
> index aa121cbe..98f5dae5 100644
> --- a/lib/bb/fetch2/gitsm.py
> +++ b/lib/bb/fetch2/gitsm.py
> @@ -169,6 +169,12 @@ class GitSM(Git):
>                  raise
>
>          Git.download(self, ud, d)
> +
> +        # If we're using a shallow mirror tarball it needs to be unpacked so
> +        # that we can examine the .gitmodules file
> +        if ud.shallow and os.path.exists(ud.fullshallow) and Git.need_update(self, ud, d):
> +            bb.utils.mkdirhier(ud.clonedir)
> +            runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=ud.clonedir)
>          self.process_submodules(ud, ud.clonedir, download_submodule, d)
>
>      def unpack(self, ud, destdir, d):
> --
> 2.20.1
>

 I realised the moment I hit send that I got the wrong mailing list...

✗ patchtest: failure for fetch2/gitsm: Unpack shallow mirror tarballs

[Patchwork]

== Series Details ==

Series: fetch2/gitsm: Unpack shallow mirror tarballs
Revision: 1
URL   : https://patchwork.openembedded.org/series/22916/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 0bfb2e9840)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe