[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4966/8267] bitbake: fetch2: pass --no-same-owner when extracting tar files compressed with 7-Zip

[Emmanuele Bassi <ebassi src gnome org>]

commit c225f0fdb52ac1a336f0d0233773a0282d8953ae
Author: Andre McCurdy <armccurdy gmail com>
Date:   Thu Mar 2 16:24:22 2017 -0800

    bitbake: fetch2: pass --no-same-owner when extracting tar files compressed with 7-Zip
    
    Treat tar files compressed with 7-Zip in the same way as tar files
    compressed with other compression formats.
    
    (Bitbake rev: 363a0f54dc7d9930537f0df25173fa31ca1f98ac)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/__init__.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 327da87..464e66b 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1404,6 +1404,10 @@ class FetchMethod(object):
                 cmd = 'lzip -dc %s | tar x --no-same-owner -f -' % file
             elif file.endswith('.lz'):
                 cmd = 'lzip -dc %s > %s' % (file, efile)
+            elif file.endswith('.tar.7z'):
+                cmd = '7z x -so %s | tar x --no-same-owner -f -' % file
+            elif file.endswith('.7z'):
+                cmd = '7za x -y %s 1>/dev/null' % file
             elif file.endswith('.zip') or file.endswith('.jar'):
                 try:
                     dos = bb.utils.to_boolean(urldata.parm.get('dos'), False)
@@ -1435,10 +1439,6 @@ class FetchMethod(object):
                 else:
                     raise UnpackError("Unable to unpack deb/ipk package - could not list contents", 
urldata.url)
                 cmd = 'ar x %s %s && tar --no-same-owner -xpf %s && rm %s' % (file, datafile, datafile, 
datafile)
-            elif file.endswith('.tar.7z'):
-                cmd = '7z x -so %s | tar xf - ' % file
-            elif file.endswith('.7z'):
-                cmd = '7za x -y %s 1>/dev/null' % file
 
         # If 'subdir' param exists, create a dir and use it as destination for unpack cmd
         if 'subdir' in urldata.parm: