[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5961/8267] recipetool: create: extract name of package from a repository

[Emmanuele Bassi <ebassi src gnome org>]

commit a7c686cfe685f7acc20af32b41b6e2f51273ac6f
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Mon May 15 09:59:53 2017 +1200

    recipetool: create: extract name of package from a repository
    
    For git repositories in the absence of any other indicator, it's not an
    unreasonable assumption that the name of the repository is the name of
    the software package it contains, so use that as PN if we don't have
    anything else.
    
    (From OE-Core rev: ef73fa70f0955912b0da140922465a3c817424e9)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/create.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 5af58a1..2a5a84c 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -339,9 +339,14 @@ def determine_from_url(srcuri):
                 pn = res.group(1).strip().replace('_', '-')
                 pv = res.group(2).strip().replace('_', '.')
 
-        if not pn and not pv and parseres.scheme not in ['git', 'gitsm', 'svn', 'hg']:
-            srcfile = os.path.basename(parseres.path.rstrip('/'))
-            pn, pv = determine_from_filename(srcfile)
+        if not pn and not pv:
+            if parseres.scheme not in ['git', 'gitsm', 'svn', 'hg']:
+                srcfile = os.path.basename(parseres.path.rstrip('/'))
+                pn, pv = determine_from_filename(srcfile)
+            elif parseres.scheme in ['git', 'gitsm']:
+                pn = os.path.basename(parseres.path.rstrip('/')).lower().replace('_', '-')
+                if pn.endswith('.git'):
+                    pn = pn[:-4]
 
     logger.debug('Determined from source URL: name = "%s", version = "%s"' % (pn, pv))
     return (pn, pv)