summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-15 16:07:17 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-17 00:21:14 +0100
commit14f3d4e58ae032caf9247669a1ca6335082ed6ff (patch)
treee6318799795577681381c10c2ebc443dc7ebabe7 /scripts
parent608c0ddf0d90d4e995c62e1a233d509efde4ef05 (diff)
downloadpoky-14f3d4e58ae032caf9247669a1ca6335082ed6ff.tar.gz
recipetool: create: fix incorrect URL variable usage
We have two variables here, srcuri and fetchuri. srcuri is what eventually ends up in the recipe, whereas fetchuri is what we actually pass to the fetcher when we fetch the source within recipetool - sometimes these need to be different particularly for an upcoming patch to handle automatically setting the branch parameter. In OE-Core revision 9a47a6690052ef943c0d4760630ee630fb012153 I erroneously changed the call to scriptutils.fetch_url() to pass srcuri instead of fetchuri - this likely didn't have any ill effect, but change it back to passing fetchuri to match the original intent. (From OE-Core rev: b66b73bcf5ee7e4488970576fdc31dfa25b35f5e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/recipetool/create.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 359eb9adfc..e21e2bf298 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -446,7 +446,7 @@ def create_recipe(args):
446 srctree = os.path.join(tempsrc, 'source') 446 srctree = os.path.join(tempsrc, 'source')
447 447
448 try: 448 try:
449 checksums, ftmpdir = scriptutils.fetch_url(tinfoil, srcuri, srcrev, srctree, logger, preserve_tmp=args.keep_temp) 449 checksums, ftmpdir = scriptutils.fetch_url(tinfoil, fetchuri, srcrev, srctree, logger, preserve_tmp=args.keep_temp)
450 except scriptutils.FetchUrlFailure as e: 450 except scriptutils.FetchUrlFailure as e:
451 logger.error(str(e)) 451 logger.error(str(e))
452 sys.exit(1) 452 sys.exit(1)