[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7467/8267] recipetool: create: fix SRCPV prefix for non-git SCMs

[Emmanuele Bassi <ebassi src gnome org>]

commit 4b202e07201655c65d65842829ddfb33e1edc5e4
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Aug 31 11:54:13 2017 +1200

    recipetool: create: fix SRCPV prefix for non-git SCMs
    
    If you're fetching from an SCM other than git (for example subversion or
    mercurial) then we need to use a different prefix for the SRCPV in PV
    instead of +git.
    
    (From OE-Core rev: ad1200c8729f21b325d347649f9dd5e5598de93e)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/create.py |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 4da745b..d8cfcbd 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -423,6 +423,7 @@ def create_recipe(args):
     srcsubdir = ''
     srcrev = '${AUTOREV}'
     srcbranch = ''
+    scheme = ''
     storeTagName = ''
     pv_srcpv = False
 
@@ -682,7 +683,14 @@ def create_recipe(args):
         lines_before.append('')
         lines_before.append('# Modify these as desired')
         # Note: we have code to replace realpv further down if it gets set to some other value
-        lines_before.append('PV = "%s+git${SRCPV}"' % (realpv or '1.0'))
+        scheme, _, _, _, _, _ = bb.fetch2.decodeurl(srcuri)
+        if scheme in ['git', 'gitsm']:
+            srcpvprefix = 'git'
+        elif scheme == 'svn':
+            srcpvprefix = 'svnr'
+        else:
+            srcpvprefix = scheme
+        lines_before.append('PV = "%s+%s${SRCPV}"' % (realpv or '1.0', srcpvprefix))
         pv_srcpv = True
         if not args.autorev and srcrev == '${AUTOREV}':
             if os.path.exists(os.path.join(srctree, '.git')):