[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4541/8267] recipetool: create: do not treat numbers in SCM URLs as versions



commit e0a94f2e1fe1e3f6f169ac4eaee6fe5dbfc7eaa2
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Tue Feb 7 09:45:42 2017 +1300

    recipetool: create: do not treat numbers in SCM URLs as versions
    
    Numbers within SCM (e.g. git) URLs are extremely unlikely to be valid
    version numbers - more likely they are just part of the name, thus don't
    try to extract them and use them as the version - doing so causes pretty
    bad behaviour within devtool:
    
    --------- snip ---------
    $ devtool add https://github.com/inhedron/libtr50
    NOTE: Fetching git://github.com/inhedron/libtr50;protocol=https...
    ...
    NOTE: Using default source tree path .../build/workspace/sources/libtr
    ...
    RecursionError: maximum recursion depth exceeded while calling a Python object
    --------- snip ---------
    
    (This was because ${PV} was being substituted into the URL, but PV's
    value was being set to include ${SRCPV}, so there was a circular
    reference.)
    
    (From OE-Core rev: 3427508b6ce865654f8bf01a6fc04b83c70315d3)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/create.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 0801223..5bd3853 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -336,7 +336,7 @@ def determine_from_url(srcuri):
                 pn = res.group(1).strip().replace('_', '-')
                 pv = res.group(2).strip().replace('_', '.')
 
-        if not pn and not pv:
+        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)
 
@@ -567,7 +567,6 @@ def create_recipe(args):
         if name_pv and not realpv:
             realpv = name_pv
 
-
     if not srcuri:
         lines_before.append('# No information for SRC_URI yet (only an external source tree was specified)')
     lines_before.append('SRC_URI = "%s"' % srcuri)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]