summaryrefslogtreecommitdiffstats
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-16 00:06:40 +0100
commitb66b73bcf5ee7e4488970576fdc31dfa25b35f5e (patch)
tree75efe98bf4992e3aa40a154277a713c02649da41
parent26842b2e4fc9c1d243ce412e845a5444cb03c4b9 (diff)
downloadopenembedded-core-contrib-b66b73bcf5ee7e4488970576fdc31dfa25b35f5e.tar.gz
openembedded-core-contrib-b66b73bcf5ee7e4488970576fdc31dfa25b35f5e.tar.bz2
openembedded-core-contrib-b66b73bcf5ee7e4488970576fdc31dfa25b35f5e.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
srctree = os.path.join(tempsrc, 'source')
try:
- checksums, ftmpdir = scriptutils.fetch_url(tinfoil, srcuri, srcrev, srctree, logger, preserve_tmp=args.keep_temp)
+ checksums, ftmpdir = scriptutils.fetch_url(tinfoil, fetchuri, srcrev, srctree, logger, preserve_tmp=args.keep_temp)
except scriptutils.FetchUrlFailure as e:
logger.error(str(e))
sys.exit(1)