summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-15 11:45:31 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-15 16:06:43 +1200
commit50d9fef8e5f4d25f89e2ee439f8c3668b742a6d3 (patch)
treea1db3fe28c2eef615d733814bae1af45d83c6896
parent5a25ed1071f0d9b7d95edcc2b5b4545f960d5f95 (diff)
downloadopenembedded-core-contrib-paule/recipetool-fetchuri.tar.gz
openembedded-core-contrib-paule/recipetool-fetchuri.tar.bz2
openembedded-core-contrib-paule/recipetool-fetchuri.zip
recipetool: create: fix incorrect URL variable usagepaule/recipetool-fetchuri
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>
-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)