[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6834/8267] recipetool: create: ensure meaningful error for malformed tarballs

[Emmanuele Bassi <ebassi src gnome org>]

commit 047d37633b2d451ee4f53c635d3f48b9b0732e44
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Jul 20 16:48:09 2017 +0200

    recipetool: create: ensure meaningful error for malformed tarballs
    
    If you pointed recipetool at a URL that should be a tarball e.g.
    https://tls.mbed.org/download/start/mbedtls-2.4.2-apache.tgz but instead
    it returns an HTML page, we try to unpack it, gzip complains but the
    operation doesn't seem to fail - instead we just get back an empty
    source tree. Change the checks to account for this - if the source tree
    is empty, check if the downloaded file in DL_DIR looks like an HTML file
    and error accordingly if it is. If it's not, error out anyway because
    no source was unpacked and it should have been (otherwise we just
    blindly set up EXTERNALSRC for this which is pointless).
    
    Fixes an aspect of [YOCTO #11407].
    
    (From OE-Core rev: 8496113b63d5a5d1f99056610c0fdb972a6200d4)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/create.py |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 8e63580..923c336 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -462,10 +462,16 @@ def create_recipe(args):
                 srcsubdir = dirlist[0]
                 srctree = os.path.join(srctree, srcsubdir)
             else:
-                with open(singleitem, 'r', errors='surrogateescape') as f:
-                    if '<html' in f.read(100).lower():
-                        logger.error('Fetching "%s" returned a single HTML page - check the URL is correct 
and functional' % fetchuri)
-                        sys.exit(1)
+                check_single_file(dirlist[0], fetchuri)
+        elif len(dirlist) == 0:
+            if '/' in fetchuri:
+                fn = os.path.join(d.getVar('DL_DIR'), fetchuri.split('/')[-1])
+                if os.path.isfile(fn):
+                    check_single_file(fn, fetchuri)
+            # If we've got to here then there's no source so we might as well give up
+            logger.error('URL %s resulted in an empty source tree' % fetchuri)
+            sys.exit(1)
+
         if os.path.exists(os.path.join(srctree, '.gitmodules')) and srcuri.startswith('git://'):
             srcuri = 'gitsm://' + srcuri[6:]
             logger.info('Fetching submodules...')
@@ -812,6 +818,14 @@ def create_recipe(args):
 
     return 0
 
+def check_single_file(fn, fetchuri):
+    """Determine if a single downloaded file is something we can't handle"""
+    with open(fn, 'r', errors='surrogateescape') as f:
+        if '<html' in f.read(100).lower():
+            logger.error('Fetching "%s" returned a single HTML page - check the URL is correct and 
functional' % fetchuri)
+            sys.exit(1)
+
+
 def handle_license_vars(srctree, lines_before, handled, extravalues, d):
     licvalues = guess_license(srctree, d)
     lic_files_chksum = []